diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:53:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:53:09 +0200 |
| commit | 033144c0d13c6e83e128f1cd5e1d460be94bace0 (patch) | |
| tree | 56c87041c9d14789fba81463915b6c7183aa634a /libavfilter/vf_showinfo.c | |
| parent | f2a581e2eeecf85c0e58e1a4bea905d717807045 (diff) | |
| parent | 56672aeaee19216d2fd8eeb9964b1f71f0af2919 (diff) | |
| download | ffmpeg-033144c0d13c6e83e128f1cd5e1d460be94bace0.tar.gz | |
Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
svq1enc: Do not entangle coded_frame
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions