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)
* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
  mjpeg: Use a more precise type for put_marker()

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

Simple merge
Simple merge