mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-25 02:44:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* modules/demux/mp4/mp4.c: we don't need to re-packetize h264 data into annexe B bytestream anymore since new versions of ffmpeg deal with it properly.

Browse Source
This commit is contained in:
Gildas Bazin 2005-06-01 17:57:50 +00:00
parent 9b7380f571
commit d0b820b3b6
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/codec/ffmpeg/video.c
View File

@ -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;

6
modules/demux/mp4/mp4.c
View File

@ -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
{