generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'

Browse Source 
* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde':
  h264_parser: don't stop on SPS_EXT in split

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-11 23:19:27 +01:00
parent 69b2d43d6a 1b66726906
commit 940f5c08e5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264_parser.c
View File

@@ -528,8 +528,10 @@ static int h264_split(AVCodecContext *avctx,
* (state&0xFFFFFF1F) == 0x105) { * (state&0xFFFFFF1F) == 0x105) {
* } * }
*/ */
if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 && if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x106 &&
(state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) { (state & 0xFFFFFF1F) != 0x107 && (state & 0xFFFFFF1F) != 0x108 &&
(state & 0xFFFFFF1F) != 0x109 && (state & 0xFFFFFF1F) != 0x10d &&
(state & 0xFFFFFF1F) != 0x10f) {
if (has_sps) { if (has_sps) {
while (i > 4 && buf[i - 5] == 0) while (i > 4 && buf[i - 5] == 0)
i--; i--;