Merge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10

Browse Source

* commit '7585a6254bbb38148e4467793fc34211b79d5f7d':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
	libavcodec/h264_sei.c

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

...

This commit is contained in:

Michael Niedermayer

2014-08-09 19:41:27 +02:00

parent 330791c2ae 7585a6254b

commit 0a83007cee

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

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

Diff Content Not Available