diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:50:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:50:55 +0200 |
| commit | e3fb8ac9564b6a3d86c5f60c940f2056a4faae56 (patch) | |
| tree | f7766be5ec0dfbdf9f1d2bcd2371195a3905f6cb /Makefile | |
| parent | 06549cee42819c2bef58bd123cd0ac9d916244f2 (diff) | |
| parent | 7520d9779c6d30b385df5a0a42da508238076192 (diff) | |
| download | ffmpeg-e3fb8ac9564b6a3d86c5f60c940f2056a4faae56.tar.gz | |
Merge commit '7520d9779c6d30b385df5a0a42da508238076192'
* commit '7520d9779c6d30b385df5a0a42da508238076192':
mjpeg: Move code out of else branch
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions