[CinCV] PATCH 2.1CVxiphmont 1/7] use external ffmpeg-20121226

[Arvind R]

ifdef out unneeded av_init and av_thread_init calls

---i
 cinelerra/ffmpeg.C     |    2 ++
 cinelerra/fileac3.C    |    2 ++
 cinelerra/fileffmpeg.C |   12 ++++++++++++
 quicktime/mpeg4.c      |    4 ++++
 quicktime/qtffmpeg.c   |    4 ++++
 quicktime/wma.c        |    2 ++
 6 files changed, 26 insertions(+)
---
diff -uprN a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
--- a/cinelerra/ffmpeg.C        2012-12-03 21:13:46.000000000 +0530
+++ b/cinelerra/ffmpeg.C        2013-01-15 17:24:07.000000000 +0530
@@ -25,7 +25,9 @@ FFMPEG::FFMPEG(Asset *asset) {

 int FFMPEG::init(char *codec_string) {

+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
        avcodec_init();
+#endif
        avcodec_register_all();

        CodecID id = codec_id(codec_string);
diff -uprN a/cinelerra/fileac3.C b/cinelerra/fileac3.C
--- a/cinelerra/fileac3.C       2012-12-03 21:13:46.000000000 +0530
+++ b/cinelerra/fileac3.C       2013-01-15 17:24:07.000000000 +0530
@@ -85,7 +85,9 @@ int FileAC3::open_file(int rd, int wr)

        if(wr)
        {
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                avcodec_init();
+#endif
                avcodec_register_all();
                codec = avcodec_find_encoder(CODEC_ID_AC3);
                if(!codec)
diff -uprN a/cinelerra/fileffmpeg.C b/cinelerra/fileffmpeg.C
--- a/cinelerra/fileffmpeg.C    2012-12-03 21:13:46.000000000 +0530
+++ b/cinelerra/fileffmpeg.C    2013-01-15 17:24:07.000000000 +0530
@@ -101,7 +101,9 @@ int FileFFMPEG::check_sig(Asset *asset)
   if(ptr) return 0;

   ffmpeg_lock->lock("FileFFMPEG::check_sig");
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
   avcodec_init();
+#endif
   avcodec_register_all();
   av_register_all();

@@ -144,7 +146,9 @@ int FileFFMPEG::open_file(int rd, int wr
   bzero(&params, sizeof(params));

   ffmpeg_lock->lock("FileFFMPEG::open_file");
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
   avcodec_init();
+#endif
   avcodec_register_all();
   av_register_all();

@@ -197,7 +201,11 @@ int FileFFMPEG::open_file(int rd, int wr
                         }
                       else
                         {
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                           avcodec_thread_init(decoder_context, file->cpus);
+#else
+                          decoder_context->thread_count = file->cpus;
+#endif
                           avcodec_open(decoder_context, codec);
                         }
                       asset->bits =
av_get_bits_per_sample_format(decoder_context->sample_fmt);
@@ -240,7 +248,11 @@ int FileFFMPEG::open_file(int rd, int wr

(double)(decoder_context->coded_width*decoder_context->sample_aspect_ratio.num)
/
                         (decoder_context->coded_height *
decoder_context->sample_aspect_ratio.den);
                       AVCodec *codec =
avcodec_find_decoder(decoder_context->codec_id);
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                       avcodec_thread_init(decoder_context, file->cpus);
+#else
+                      decoder_context->thread_count = file->cpus;
+#endif
                       avcodec_open(decoder_context, codec);

                     }
diff -uprN a/quicktime/mpeg4.c b/quicktime/mpeg4.c
--- a/quicktime/mpeg4.c 2012-12-03 21:13:46.000000000 +0530
+++ b/quicktime/mpeg4.c 2013-01-15 17:35:36.000000000 +0530
@@ -629,7 +629,9 @@ static int encode(quicktime_t *file, uns
                        if(!ffmpeg_initialized)
                        {
                                ffmpeg_initialized = 1;
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                                avcodec_init();
+#endif
                                avcodec_register_all();
                        }

@@ -720,7 +722,9 @@ static int encode(quicktime_t *file, uns
                                 codec->ffmpeg_id == CODEC_ID_H263P ||
                                 codec->ffmpeg_id == 
CODEC_FLAG_H263P_SLICE_STRUCT))
                        {
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                                avcodec_thread_init(context, file->cpus);
+#endif
                                context->thread_count = file->cpus;
                        }

diff -uprN a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
--- a/quicktime/qtffmpeg.c      2012-12-03 21:13:46.000000000 +0530
+++ b/quicktime/qtffmpeg.c      2013-01-15 17:32:40.000000000 +0530
@@ -54,7 +54,9 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
        if(!ffmpeg_initialized)
        {
                ffmpeg_initialized = 1;
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                avcodec_init();
+#endif
                avcodec_register_all();
        }

@@ -93,7 +95,9 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
                                 ffmpeg_id == CODEC_ID_H263P ||
                                 ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
                {
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                        avcodec_thread_init(context, cpus);
+#endif
                        context->thread_count = cpus;
                }
                if(avcodec_open(context,
diff -uprN a/quicktime/wma.c b/quicktime/wma.c
--- a/quicktime/wma.c   2012-12-03 21:13:46.000000000 +0530
+++ b/quicktime/wma.c   2013-01-15 17:24:07.000000000 +0530
@@ -67,7 +67,9 @@ static int init_decode(quicktime_audio_m
                if(!ffmpeg_initialized)
                {
                        ffmpeg_initialized = 1;
+#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
                        avcodec_init();
+#endif
                        avcodec_register_all();
                }
_______________________________________________
Cinelerra mailing list
Cinelerra@skolelinux.no
https://lists.skolelinux.org/listinfo/cinelerra