summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--libavcodec/h264.c8
-rw-r--r--libavcodec/h264.h3
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,
};