diff options
| author | Philip Langdale <philipl@overt.org> | 2011-06-18 10:58:42 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2011-06-21 21:03:46 -0700 |
| commit | b2ad33dead8e97b8eee4e707e54dcd64b4854b8d (patch) | |
| tree | 4fdafcd2ab9e22f26acb93bf377d3998a3c829cd | |
| parent | 63e0697294ce0040fba58daa0a1de4e45dc4c677 (diff) | |
| download | ffmpeg-b2ad33dead8e97b8eee4e707e54dcd64b4854b8d.tar.gz | |
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>
| -rw-r--r-- | libavcodec/crystalhd.c | 8 |
1 files 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 |