casa-mp-base
Public
Source
xxxxxxxxxx--- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig 2013-02-06 06:34:52.000000000 +0900+++ libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2018-05-03 13:34:33.000000000 +0900 uint8_t pDataBuffer[32768];//65536]; long lSize = 32768;-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) ByteIOContext ByteIOCtx; if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL, seek_data) < 0) return -1; if(fmt == NULL) return 1;-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) AVFormatContext *fc = NULL; if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0) return -1; ar.addTriplet(streamuri, durationPropertyName,outs.str()); }-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) //FIXME we must stop using the deprecated fuction av_metadata_get and use // av_dict_get once we are able to detect the version of FFMpeg being used // using version macros. same goes for all occurences of this function. if (size_t len = strlen(p->name)) { ar.addTriplet(streamuri, codecPropertyName, string(p->name, len)); }- } else if (size_t len = strlen(codec.codec_name)) {- ar.addTriplet(streamuri, codecPropertyName, string(codec.codec_name, len));+ } else {+ size_t len = strlen("stub");+ ar.addTriplet(streamuri, codecPropertyName, string("stub", len)); } /* 00792 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { // Tags-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0); #else AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0); } }-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) entry = av_metadata_get(fc->metadata, "author", NULL, 0); #else entry = av_dict_get(fc->metadata, "author", NULL, 0); } }-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) entry = av_metadata_get(fc->metadata, "copyright", NULL, 0); #else entry = av_dict_get(fc->metadata, "copyright", NULL, 0); } }-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) entry = av_metadata_get(fc->metadata, "comment", NULL, 0); #else entry = av_dict_get(fc->metadata, "comment", NULL, 0); } }-#if (LIBAVUTIL_VERSION_MAJOR < 51)+#if (LIBAVCODEC_VERSION_MAJOR < 51) entry = av_metadata_get(fc->metadata, "album", NULL, 0); #else entry = av_dict_get(fc->metadata, "album", NULL, 0); } }-#if (LIBAVUTIL_VERSION_MAJOR < 51)