mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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 <philipl@overt.org>
This commit is contained in:
parent
63e0697294
commit
b2ad33dead
@ -402,8 +402,6 @@ static av_cold int init(AVCodecContext *avctx)
|
|||||||
uint8_t *dummy_p;
|
uint8_t *dummy_p;
|
||||||
int dummy_int;
|
int dummy_int;
|
||||||
|
|
||||||
format.startCodeSz = (avctx->extradata[4] & 0x03) + 1;
|
|
||||||
|
|
||||||
priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb");
|
priv->bsfc = av_bitstream_filter_init("h264_mp4toannexb");
|
||||||
if (!priv->bsfc) {
|
if (!priv->bsfc) {
|
||||||
av_log(avctx, AV_LOG_ERROR,
|
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,
|
av_bitstream_filter_filter(priv->bsfc, avctx, NULL, &dummy_p,
|
||||||
&dummy_int, NULL, 0, 0);
|
&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:
|
case BC_MSUBTYPE_H264:
|
||||||
format.startCodeSz = 4;
|
format.startCodeSz = 4;
|
||||||
// Fall-through
|
// Fall-through
|
||||||
|
Loading…
Reference in New Issue
Block a user