Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 17:27:58 +0000 (18:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 17:28:49 +0000 (18:28 +0100)
commitc53a1507aa097ad4793c0d4f840da09dba6ffbaf
tree9f50c9950b68aea04a5221dbedc6f9040816d236
parentad0cf8e063b846cd3653875a1b88c7469fd257a1
parent199d9f995da53fe2507821f6d96bbc692574e1a9
Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'

* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
  mjpegdec: fix undefined shift

Conflicts:
libavcodec/mjpegdec.c

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