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

h264_parser: don't stop on SPS_EXT in split

Browse Source 
Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split.
These codes can come before the PPS and results in incomplete extradata.
This commit is contained in:
John Stebbins 2014-10-31 08:24:38 -07:00 committed by Vittorio Giovara
parent 4cb9f1a774
commit 1b66726906
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264_parser.c
View File

@ -473,8 +473,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--;