[FFmpeg-cvslog] Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'
Michael Niedermayer
git at videolan.org
Fri Dec 6 04:25:50 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 04:18:02 2013 +0100| [fb06b8ba9371495d051d2fd815a21fb1c1392b73] | committer: Michael Niedermayer
Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'
* commit '0812f5a40a0a190172b6de6e91755b882472ddc5':
mjpegenc: write the JFIF header if the sample aspect ratio is set
Conflicts:
libavcodec/mjpegenc.c
See: f3ce748d3453a490f32a5518f9cf6bef6892a30c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb06b8ba9371495d051d2fd815a21fb1c1392b73
---
More information about the ffmpeg-cvslog
mailing list