diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 21:46:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 21:50:34 +0200 |
| commit | 3a4c22f8067fc4e9005e7dc781dff541abca472a (patch) | |
| tree | 57c9f00ba18fec0249a06d47398114746ca86f5c /libavfilter/fifo.c | |
| parent | 0b2f860db53e6274836036d3e3ff57f8d043aa0f (diff) | |
| parent | 6d96c7ea89600655b1f18a3b12f3f041fa714152 (diff) | |
| download | ffmpeg-3a4c22f8067fc4e9005e7dc781dff541abca472a.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavfilter/fifo.c')
0 files changed, 0 insertions, 0 deletions