diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 11:25:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 11:25:46 +0200 |
| commit | 3b071a4390f02ecbeb993f16f93b01f4e420def8 (patch) | |
| tree | ef15b1e9d24f3ad9700c0a17ea770a45007a0230 /libavformat/urldecode.c | |
| parent | f57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd (diff) | |
| parent | a030279a67ef883df8cf3707774656fa1be81078 (diff) | |
| download | ffmpeg-3b071a4390f02ecbeb993f16f93b01f4e420def8.tar.gz | |
Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
ljpeg: use the correct number of components in yuv
Conflicts:
libavcodec/mjpegdec.c
See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/urldecode.c')
0 files changed, 0 insertions, 0 deletions