diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:31:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:31:42 +0200 |
| commit | 6497aab022bf791f43a22d1ef2171994ef8e8980 (patch) | |
| tree | fdb8bd4bd0967cae653c611ab111512111eca97f /libavfilter/vf_showinfo.c | |
| parent | 16b68bd2ee5f36194b0bd9accc87a62a4b6048d2 (diff) | |
| parent | 95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e (diff) | |
| download | ffmpeg-6497aab022bf791f43a22d1ef2171994ef8e8980.tar.gz | |
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
roqvideoenc: Drop unneeded initialization
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions