From b2ad33dead8e97b8eee4e707e54dcd64b4854b8d Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sat, 18 Jun 2011 10:58:42 -0700 Subject: [PATCH] CrystalHD: Always identify H.264 streams as Annex B. Now that we're converting all streams to Annex B format, we can identify them as such to the hardware. Signed-off-by: Philip Langdale --- libavcodec/crystalhd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 632d774dfa..173f35607d 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -402,8 +402,6 @@ static av_cold int init(AVCodecContext *avctx) uint8_t *dummy_p; int dummy_int; - format.startCodeSz = (avctx->extradata[4] & 0x03) + 1; - priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb"); if (!priv->bsfc) { av_log(avctx, AV_LOG_ERROR, @@ -412,11 +410,9 @@ static av_cold int init(AVCodecContext *avctx) } av_bitstream_filter_filter(priv->bsfc, avctx, NULL, &dummy_p, &dummy_int, NULL, 0, 0); - - format.pMetaData = avctx->extradata; - format.metaDataSz = avctx->extradata_size; } - break; + subtype = BC_MSUBTYPE_H264; + // Fall-through case BC_MSUBTYPE_H264: format.startCodeSz = 4; // Fall-through