diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:40:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 00:41:02 +0100 |
| commit | 158cf1d52df6d91580d6b74e55db8ffdbaf24011 (patch) | |
| tree | 1d7b6e87c46024fa0f13713e10514f7b5453e150 /libavformat/mpl2dec.c | |
| parent | 6fd7456f85720e8a6fdfacd365d14738d2e272b8 (diff) | |
| parent | 2496dbd68b29bd36fbf4753a46163d33f6dae70e (diff) | |
| download | ffmpeg-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 'libavformat/mpl2dec.c')
0 files changed, 0 insertions, 0 deletions