Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 22:47:40 +0000 (00:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 22:48:04 +0000 (00:48 +0200)
commit48183f144d1d6f7af8e8526a2e020a6a88ad38c0
treebdf395dc9de6ef32a268cbb0b878475374a5d93f
parent21ee6da70c4e5a56ea74aec0f8d21465a873b874
parent87f87ccf32055aca25fa08e29e22cca1ba9976d5
Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'

* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
  mjpeg: Use a more precise type for put_marker()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpeg.h
libavcodec/mjpegenc.h