diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 10:06:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 10:06:43 +0100 |
| commit | 5ac558113202faef976e2095dfa14618e8e96b6d (patch) | |
| tree | 6059b8c6bb0fa7704542aa32ff1ada9d0447c763 /doc/ffprobe.xsd | |
| parent | 4a0d8277d5f6fbc2eeac5e40c5cef55316839cfc (diff) | |
| parent | e1eaaec765d2e726618633fcbd2e06fded7647a8 (diff) | |
| download | ffmpeg-5ac558113202faef976e2095dfa14618e8e96b6d.tar.gz | |
Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'
* commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8':
mjpegenc: remove commented out never-to-be-finished WIP cruft
Conflicts:
libavcodec/mjpegenc.c
The unfinished 2-matrix code is left in place and not removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.xsd')
0 files changed, 0 insertions, 0 deletions