Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'

Browse Source

* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
  h264: remove a now redundant error check

Conflicts:
	libavcodec/h264_slice.c

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

...

This commit is contained in:

Michael Niedermayer

2015-03-05 20:55:56 +01:00

parent 777179edb5 ad786dd450

commit 22ad0546c8

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