diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:34:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:34:11 +0200 |
| commit | f982d006bb9e5ffb6bc032e62b5f34177a83df85 (patch) | |
| tree | d0c88573dd27d0633675955165a64b036cc10974 /libavcodec/mjpeg.h | |
| parent | 4cd066b69c08cd91aa4b5e40deb4b2f5c7e651ee (diff) | |
| parent | 636ced8e1dc8248a1353b416240b93d70ad03edb (diff) | |
| download | ffmpeg-f982d006bb9e5ffb6bc032e62b5f34177a83df85.tar.gz | |
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
cmdutils: wrap exit explicitly
Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
0 files changed, 0 insertions, 0 deletions