Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  libx264: check color_range

Conflicts:
	libavcodec/libx264.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-17 16:28:07 +01:00

parent 34e325efa5 75177b2f5e

commit b1eb92a6bc

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