aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-18 00:40:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-18 00:41:02 +0100
commit158cf1d52df6d91580d6b74e55db8ffdbaf24011 (patch)
tree1d7b6e87c46024fa0f13713e10514f7b5453e150 /doc
parent6fd7456f85720e8a6fdfacd365d14738d2e272b8 (diff)
parent2496dbd68b29bd36fbf4753a46163d33f6dae70e (diff)
downloadffmpeg-158cf1d52df6d91580d6b74e55db8ffdbaf24011.tar.gz
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@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions