RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068' 

* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
  h264: Discard currently unsupported registered sei

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-08-24 10:36:07 +02:00
parent 59cae1916e f9ab4fe1f7
commit a4c13f95fb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264_sei.c
View File

@ -180,6 +180,12 @@ static int decode_registered_user_data_closed_caption(H264Context *h, int size)
skip_bits(&h->gb, 8); // marker_bits
}
}
} else {
int i;
avpriv_request_sample(h->avctx, "Subtitles with data type 0x%02x",
user_data_type_code);
for (i = 0; i < size - 1; i++)
skip_bits(&h->gb, 8);
}
return 0;