diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 21:16:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 21:16:06 +0200 |
| commit | ec0b08d20b73c9257fad31838ba7837f51dcfee6 (patch) | |
| tree | 2783bca755bb1c0d2eed17fe394a9b38a18d7828 /libavfilter/vf_showinfo.c | |
| parent | c6a596f62685e6a446b6e8703d6409b367675134 (diff) | |
| parent | b7b1bf9166ac3102c401295fdd5d4933c512aa50 (diff) | |
| download | ffmpeg-ec0b08d20b73c9257fad31838ba7837f51dcfee6.tar.gz | |
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions