Merge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'

Browse Source

* commit '7ab551f9fd9a63586649a7df8790ddaeac55420f':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
	libavcodec/h264_sei.c

Not merged, as this would remove 2 bitstream compliance checks.
The specification does not allow the bitstream to end in the middle
of these variable length elements and we have no samples which
have such non compliant truncation either so its better to error
out. Which is simpler as well

This issue also has been fixed long ago
See: 9decfc17bb

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-08-01 17:34:57 +02:00

parent 229a1e8694 7ab551f9fd

commit 293124cae8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available