Merge commit '7520d9779c6d30b385df5a0a42da508238076192'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 11:50:55 +0000 (13:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 11:50:55 +0000 (13:50 +0200)
commite3fb8ac9564b6a3d86c5f60c940f2056a4faae56
treef7766be5ec0dfbdf9f1d2bcd2371195a3905f6cb
parent06549cee42819c2bef58bd123cd0ac9d916244f2
parent7520d9779c6d30b385df5a0a42da508238076192
Merge commit '7520d9779c6d30b385df5a0a42da508238076192'

* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c