diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:32:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:32:48 +0100 |
| commit | 15fe694e5ca13e217a643553fbd8e15b5fc865de (patch) | |
| tree | 02afe639baac5afd4c8abd5aeef73d1c6ac0bc23 /libavformat/smjpegenc.c | |
| parent | 1034fbdf53003eb74ad30576d1f2205abc429357 (diff) | |
| parent | b4679ecdbd80ae050094733f137ccd7ebf1316ab (diff) | |
| download | ffmpeg-15fe694e5ca13e217a643553fbd8e15b5fc865de.tar.gz | |
Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
{v,a}f_showinfo: print frame side data
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpegenc.c')
0 files changed, 0 insertions, 0 deletions