[FFmpeg-cvslog] Merge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 00:46:54 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:40:50 2015 +0100| [158cf1d52df6d91580d6b74e55db8ffdbaf24011] | committer: Michael Niedermayer
Merge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4
* commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e':
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=158cf1d52df6d91580d6b74e55db8ffdbaf24011
---
More information about the ffmpeg-cvslog
mailing list