* modules/demux/mp4/mp4.c: we don't need to re-packetize h264 data into annexe B...

diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index 336a7d87b06cd189f4222636ede2909a0543fcf4..0f7b2c2bc85219841c49e55d123012d9e455d2b3 100644 (file)
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -728,12 +728,6 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
                       p_sys->p_context->sub_id );
         }
     }
-    /* FIXME: remove when ffmpeg deals properly with avc1 */
-    else if( p_dec->fmt_in.i_codec == VLC_FOURCC('a','v','c','1') )
-    {
-        ;
-    }
-    /* End FIXME */
     else
     {
         p_sys->p_context->extradata_size = i_size;

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 695cf615eeffce040d07ec292f4ed1bb25566b8d..50535edfe4f6433ff4649fd2b1a3109a0644d499 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1400,12 +1400,10 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
 
                 if( p_avcC )
                 {
-                    /* Hack: use a packetizer to reecampsulate data in anexe B format */
-                    msg_Dbg( p_demux, "avcC: size=%d", p_avcC->data.p_avcC->i_avcC );
                     p_track->fmt.i_extra = p_avcC->data.p_avcC->i_avcC;
                     p_track->fmt.p_extra = malloc( p_avcC->data.p_avcC->i_avcC );
-                    memcpy( p_track->fmt.p_extra, p_avcC->data.p_avcC->p_avcC, p_track->fmt.i_extra );
-                    p_track->fmt.b_packetized = VLC_FALSE;
+                    memcpy( p_track->fmt.p_extra, p_avcC->data.p_avcC->p_avcC,
+                            p_track->fmt.i_extra );
                 }
                 else
                 {