| author | Jian Wang <jian.wang@amlogic.com> | 2017-03-29 10:29:26 (GMT) |
|---|---|---|
| committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2017-04-11 12:23:53 (GMT) |
| commit | c293646916c0993844c026a16f9e99a9fa24888d (patch) | |
| tree | c10134120421c7cbbc810b4865bdb40a3055fbc3 | |
| parent | 8b0b858b565b5157d4221b24f81aad799b57f2dd (diff) | |
| download | ffmpeg-c293646916c0993844c026a16f9e99a9fa24888d.zip ffmpeg-c293646916c0993844c026a16f9e99a9fa24888d.tar.gz ffmpeg-c293646916c0993844c026a16f9e99a9fa24888d.tar.bz2 | |
PD#141328: Add h264 mvc support
Change-Id: Id133e8bd1677a4b42d41055ada04dc379776db05
| -rw-r--r-- | libavcodec/h264.c | 8 | ||||
| -rw-r--r-- | libavcodec/h264.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index cd6fff8..3aef3cb 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4964,6 +4964,14 @@ again: case NAL_SPS_EXT: case NAL_AUXILIARY_SLICE: break; + case NAL_PREFIX: + case NAL_SUB_SPS: + case NAL_SLC_EXT: + /*0x1b is ts avc stream type set mvc once*/ + if (avctx->codec_tag == 0x1b) { + avctx->codec_tag = MKTAG('M', 'V', 'C', ' '); + } + break; case NAL_FF_IGNORE: break; default: diff --git a/libavcodec/h264.h b/libavcodec/h264.h index ed7f04b..eaffeec 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -115,7 +115,10 @@ enum { NAL_END_STREAM, NAL_FILLER_DATA, NAL_SPS_EXT, + NAL_PREFIX = 14, + NAL_SUB_SPS, NAL_AUXILIARY_SLICE = 19, + NAL_SLC_EXT, NAL_FF_IGNORE = 0xff0f001, }; |