Merge commit '1c1fbc70ca'

Browse source

* commit '1c1fbc70ca':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-17 16:10:17 +01:00

parent ca0e6fa731 1c1fbc70ca

commit 020baa0be6

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 is not available