structure member renames and missing IDs ifdef'ed out.
---
mpeg4.c | 12 ++++++++++--
qtffmpeg.c | 6 ++++--
2 files changed, 14 insertions(+), 4 deletions(-)
---
diff -uprN a/quicktime/mpeg4.c b/quicktime/mpeg4.c
--- a/quicktime/mpeg4.c 2013-01-15 17:40:42.000000000 +0530
+++ b/quicktime/mpeg4.c 2013-01-15 17:39:29.000000000 +0530
@@ -676,7 +676,11 @@ static int encode(quicktime_t *file, uns
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
context->error_resilience = FF_ER_CAREFUL;
#else
+#if LIBAVCODEC_VERSION_MAJOR < 54
context->error_recognition = FF_ER_CAREFUL;
+#else
+ context->err_recognition = AV_EF_CAREFUL;
+#endif
#endif
context->error_concealment = 3;
context->frame_skip_cmp = FF_CMP_DCTMAX;
@@ -701,7 +705,9 @@ static int encode(quicktime_t *file, uns
context->profile= FF_PROFILE_UNKNOWN;
context->rc_buffer_aggressivity = 1.0;
context->level= FF_LEVEL_UNKNOWN;
+#if LIBAVCODEC_VERSION_MAJOR < 54
context->flags |= CODEC_FLAG_H263P_UMV;
+#endif
context->flags |= CODEC_FLAG_AC_PRED;
// All the forbidden settings can be extracted from
libavcodec/mpegvideo.c of ffmpeg...
@@ -719,8 +725,10 @@ static int encode(quicktime_t *file, uns
(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
- codec->ffmpeg_id == CODEC_ID_H263P ||
- codec->ffmpeg_id ==
CODEC_FLAG_H263P_SLICE_STRUCT))
+#if LIBAVCODEC_VERSION_MAJOR < 54
+ codec->ffmpeg_id ==
CODEC_FLAG_H263P_SLICE_STRUCT ||
+#endif
+ codec->ffmpeg_id == CODEC_ID_H263P))
{
#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
avcodec_thread_init(context, file->cpus);
diff -uprN a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
--- a/quicktime/qtffmpeg.c 2013-01-15 17:40:42.000000000 +0530
+++ b/quicktime/qtffmpeg.c 2013-01-15 17:39:29.000000000 +0530
@@ -92,8 +92,10 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
(ffmpeg_id == CODEC_ID_MPEG4 ||
ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
- ffmpeg_id == CODEC_ID_H263P ||
- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
+#if LIBAVCODEC_VERSION_MAJOR < 54
+ ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT ||
+#endif
+ ffmpeg_id == CODEC_ID_H263P))
{
#if LIBAVCODEC_VERSION_INT < ((53<<16)+(35<<8)+0)
avcodec_thread_init(context, cpus);
_______________________________________________
Cinelerra mailing list
[email protected]
https://lists.skolelinux.org/listinfo/cinelerra
