[Qt][MOVIE_LOADER][SOUND_LOADER] Will FIX FTBFS with FFMPEG 2.x.

diff --git a/source/src/qt/avio/movie_loader.cpp b/source/src/qt/avio/movie_loader.cpp
index 447c744..99d35e6 100644 (file)
--- a/source/src/qt/avio/movie_loader.cpp
+++ b/source/src/qt/avio/movie_loader.cpp
@@ -233,8 +233,9 @@ int MOVIE_LOADER::decode_packet(int *got_frame, int cached)
                                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_LOADER, "Audio: Failed to allocate context\n");
                                return -1;
                        }
+#if LIBAVCODEC_VERSION_MAJOR > 56
                        avcodec_parameters_to_context(c, audio_stream->codecpar);
-
+#endif
                        int dst_nb_samples = av_rescale_rnd(swr_get_delay(swr_context, c->sample_rate) + frame->nb_samples,
                                                                                                c->sample_rate, c->sample_rate,  AV_ROUND_UP);
                        //av_ts_make_time_string(str_buf, frame->pts, &audio_dec_ctx->time_base);
@@ -312,6 +313,10 @@ int MOVIE_LOADER::open_codec_context(int *stream_idx,
         st = fmt_ctx->streams[stream_index];
                
         /* find decoder for the stream */
+#if LIBAVCODEC_VERSION_MAJOR <= 56
+               dec_ctx = st->codec;
+               __dec = avcodec_find_decoder(dec_ctx->codec_id);
+#else
                __dec = avcodec_find_decoder(st->codecpar->codec_id);
                if (!__dec) {
                        //avcodec_free_context(&dec_ctx);
@@ -321,7 +326,8 @@ int MOVIE_LOADER::open_codec_context(int *stream_idx,
         }
                dec_ctx = avcodec_alloc_context3(__dec);
                avcodec_parameters_to_context(dec_ctx, st->codecpar);
-               printf("CODEC %s\n", __dec->name);
+#endif
+               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_LOADER, "CODEC %s\n", __dec->name);
                if(ctx != NULL) {
                        *ctx = dec_ctx;
                }

diff --git a/source/src/qt/avio/sound_loader.cpp b/source/src/qt/avio/sound_loader.cpp
index 25f8378..d10e0d4 100644 (file)
--- a/source/src/qt/avio/sound_loader.cpp
+++ b/source/src/qt/avio/sound_loader.cpp
@@ -66,7 +66,11 @@ bool SOUND_LOADER::open(int id, QString filename)
 
        if (open_codec_context(&audio_stream_idx, fmt_ctx, &audio_dec_ctx, AVMEDIA_TYPE_AUDIO) >= 0) {
                audio_stream = fmt_ctx->streams[audio_stream_idx];
+#if LIBAVCODEC_VERSION_MAJOR > 56
                sound_rate = audio_stream->codecpar->sample_rate;
+#else
+               sound_rate = audio_stream->codec->sample_rate;
+#endif
        }
        swr_context = swr_alloc();
        if(swr_context == NULL) {
@@ -185,7 +189,11 @@ int SOUND_LOADER::decode_packet(int *got_frame, int cached)
                if (*got_frame) {
                        //size_t unpadded_linesize = frame->nb_samples * av_get_bytes_per_sample((enum AVSampleFormat)frame->format);
                        //char str_buf[AV_TS_MAX_STRING_SIZE] = {0};
+#if LIBAVCODEC_VERSION_MAJOR > 56
+                       AVCodecParameters *c = audio_stream->codecpar;
+#else
                        AVCodecContext *c = audio_stream->codec;
+#endif
                        int dst_nb_samples = av_rescale_rnd(swr_get_delay(swr_context, c->sample_rate) + frame->nb_samples,
                                                                                                c->sample_rate, c->sample_rate,  AV_ROUND_UP);
                        //av_ts_make_time_string(str_buf, frame->pts, &audio_dec_ctx->time_base);
@@ -261,6 +269,7 @@ int SOUND_LOADER::open_codec_context(int *stream_idx,
         st = fmt_ctx->streams[stream_index];
 
         /* find decoder for the stream */
+#if LIBAVCODEC_VERSION_MAJOR > 56
                dec = avcodec_find_decoder(st->codecpar->codec_id);
         if (!dec) {
             p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_SOUND_LOADER, "Failed to find %s codec\n",
@@ -269,6 +278,10 @@ int SOUND_LOADER::open_codec_context(int *stream_idx,
         }
                dec_ctx = avcodec_alloc_context3(dec);
                avcodec_parameters_to_context(dec_ctx, st->codecpar);
+#else
+               dec = avcodec_find_decoder(st->codec->codec_id);
+               dec_ctx = st->codec;
+#endif
                if(ctx != NULL) {
                        *ctx = dec_ctx;
                }