libav10

Gbp-Pq: Name libav10.patch

diff --git a/modules/ffmpeg_in/ffmpeg_decode.c b/modules/ffmpeg_in/ffmpeg_decode.c
index 2eba865b708647a16b3132b151d2b8f83f3ed201..53bbd6d3aea54b12a7d3e833ff2e8e9bddf7839b 100644 (file)
--- a/modules/ffmpeg_in/ffmpeg_decode.c
+++ b/modules/ffmpeg_in/ffmpeg_decode.c
@@ -408,13 +408,13 @@ static GF_Err FFDEC_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
 
        } else {
                switch ((*codec)->id) {
-               case CODEC_ID_MJPEG:
-               case CODEC_ID_MJPEGB:
-               case CODEC_ID_LJPEG:
+               case AV_CODEC_ID_MJPEG:
+               case AV_CODEC_ID_MJPEGB:
+               case AV_CODEC_ID_LJPEG:
 #if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(51, 20, 0))
-               case CODEC_ID_GIF:
+               case AV_CODEC_ID_GIF:
 #endif
-               case CODEC_ID_RAWVIDEO:
+               case AV_CODEC_ID_RAWVIDEO:
                        if ((*ctx)->pix_fmt==PIX_FMT_YUV420P) {
                                ffd->pix_fmt = GF_PIXEL_YV12;
                        } else {
@@ -422,7 +422,7 @@ static GF_Err FFDEC_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
                        }
                        break;
 
-               case CODEC_ID_DVD_SUBTITLE:
+               case AV_CODEC_ID_DVD_SUBTITLE:
 #if !defined(FF_API_AVFRAME_LAVC)
                        *frame = avcodec_alloc_frame();
 #else

diff --git a/modules/ffmpeg_in/ffmpeg_demux.c b/modules/ffmpeg_in/ffmpeg_demux.c
index ed945a49971116cf6d0a89568436b5abe8d8e585..213c4dc3635aa2ee1917034d9b7b8a29878511e0 100644 (file)
--- a/modules/ffmpeg_in/ffmpeg_demux.c
+++ b/modules/ffmpeg_in/ffmpeg_demux.c
@@ -54,7 +54,7 @@
 #endif /* AVERROR_NOFMT */
 
 
-#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 54)
+#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 55)
 
 #define av_find_stream_info(__c)       avformat_find_stream_info(__c, NULL)
 #define USE_AVFORMAT_OPEN_INPUT        1