Commit 17fe900b authored by Laurent Aimar's avatar Laurent Aimar

* 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).
parent 47ca8718
...@@ -461,6 +461,9 @@ static struct ...@@ -461,6 +461,9 @@ static struct
VIDEO_ES, "h264" }, VIDEO_ES, "h264" },
{ VLC_FOURCC('H','2','6','4'), CODEC_ID_H264, { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
VIDEO_ES, "h264" }, VIDEO_ES, "h264" },
/* avc1: special case h264 */
{ VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
VIDEO_ES, "h264" },
/* H263 and H263i */ /* H263 and H263i */
/* H263(+) is also known as Real Video 1.0 */ /* H263(+) is also known as Real Video 1.0 */
......
...@@ -349,7 +349,7 @@ int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -349,7 +349,7 @@ int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context,
p_sys->p_context->sub_id ); 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_size = i_size;
p_sys->p_context->extradata = p_sys->p_context->extradata =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment