[FFmpeg-cvslog] Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'
Michael Niedermayer
git at videolan.org
Sat Oct 18 22:01:16 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 21:46:28 2014 +0200| [3a4c22f8067fc4e9005e7dc781dff541abca472a] | committer: Michael Niedermayer
Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'
* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
vf_showinfo: Forward the av_image_get_linesize error
Conflicts:
libavfilter/vf_showinfo.c
See: 2aecfd4f209688a8365f18b351f0ecf12fe5f873
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a4c22f8067fc4e9005e7dc781dff541abca472a
---
More information about the ffmpeg-cvslog
mailing list