diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:40:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:40:34 +0200 |
| commit | a99f0ad194fd48ae8afd9264595b7ca6f45e2a8a (patch) | |
| tree | 0a0fa948a17806980d037dadda3a9643f1571afb /libavfilter/vf_showinfo.c | |
| parent | 6497aab022bf791f43a22d1ef2171994ef8e8980 (diff) | |
| parent | 91767360d86ac786571593ab11c7291010ab3829 (diff) | |
| download | ffmpeg-a99f0ad194fd48ae8afd9264595b7ca6f45e2a8a.tar.gz | |
Merge commit '91767360d86ac786571593ab11c7291010ab3829'
* commit '91767360d86ac786571593ab11c7291010ab3829':
a64multienc: Do not entangle coded_frame
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions