Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'

Browse Source

* commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
	libavcodec/hevc.c

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

...

This commit is contained in:

Michael Niedermayer 2015-05-20 19:33:13 +02:00

parent bb23a15df5 3efe0393e4

commit 642355712b

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