aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-11 23:19:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-11 23:21:12 +0100
commit940f5c08e5125fd2ef235229aca504708ff282f0 (patch)
tree0f50132a578d1b59ffc579c01632e6cfddefba69 /libavcodec/h264_parser.c
parent69b2d43d6afee6d8e11c09d74c6b5aa375304a1c (diff)
parent1b667269062eb6aec0b8726393ea91b7f7f57fde (diff)
downloadffmpeg-940f5c08e5125fd2ef235229aca504708ff282f0.tar.gz
Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'
* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde': h264_parser: don't stop on SPS_EXT in split Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
-rw-r--r--libavcodec/h264_parser.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 5a62f5c95c..d0592ad5f8 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -528,8 +528,10 @@ static int h264_split(AVCodecContext *avctx,
* (state&0xFFFFFF1F) == 0x105) {
* }
*/
- if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 &&
- (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) {
+ if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x106 &&
+ (state & 0xFFFFFF1F) != 0x107 && (state & 0xFFFFFF1F) != 0x108 &&
+ (state & 0xFFFFFF1F) != 0x109 && (state & 0xFFFFFF1F) != 0x10d &&
+ (state & 0xFFFFFF1F) != 0x10f) {
if (has_sps) {
while (i > 4 && buf[i - 5] == 0)
i--;