Merge commit '7520d977'

* commit '7520d977': mjpeg: Move code out of else branch Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '7520d977'
* commit '7520d977': mjpeg: Move code out of else branch Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e3fb8ac9 · Michael Niedermayer · 06549cee · 7520d977 · e3fb8ac9
Commit e3fb8ac9 authored Jun 30, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 134 additions and 135 deletions

mjpegdec.c libavcodec/mjpegdec.c +134 -135

No files found.
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c