* all: added avc1 support. Well there is a hack because we need to

first go through the h264 packetizer that will convert avc1 into a
proper annexe B stream (untested).

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 589005256c5d9176e55b1d0a44698641b9e8c642..6cf89dce4838789aa840a8b77f83e76e5bca8d89 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -461,6 +461,9 @@ static struct
       VIDEO_ES, "h264" },
     { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
       VIDEO_ES, "h264" },
+    /* avc1: special case h264 */
+    { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
+      VIDEO_ES, "h264" },
 
 /* H263 and H263i */
 /* H263(+) is also known as Real Video 1.0 */

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index 75bfb1e3307cf08e9bf7cad5456604c789452f53..a27b6533bb5879a21b89670faedb566b534e89d9 100644 (file)
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -349,7 +349,7 @@ int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context,
                           p_sys->p_context->sub_id );
             }
         }
-        else
+        else if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'a', 'v', 'c', '1' ) )
         {
             p_sys->p_context->extradata_size = i_size;
             p_sys->p_context->extradata =