diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:10:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:12:25 +0100 |
| commit | 020baa0be64b460d48fecdfe13f1adabf6a293cd (patch) | |
| tree | cce55a4bc9cd225afd686d7a00a191e60f18c0fa | |
| parent | ca0e6fa7317cbc0677f6e90945a61baef3937915 (diff) | |
| parent | 1c1fbc70cae44c10af8ff865826e31c17bc9f347 (diff) | |
| download | ffmpeg-020baa0be64b460d48fecdfe13f1adabf6a293cd.tar.gz | |
Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'
* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
mjpeg: set color_range
Conflicts:
libavcodec/mjpegdec.c
See: 2f870e262e953815060de0ebea9b6653133b203e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions