diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:33:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:33:48 +0200 |
| commit | 75ff0e8c50d12c40170a21479ac07f573952cdf2 (patch) | |
| tree | aa80ba90519d368f637ec168d65a627a605205b6 /libavformat/swfenc.c | |
| parent | f02221d65143aa9a5719fa83f159daaa1308b6a0 (diff) | |
| parent | 01a550bda29eb05fb230576e5223034974aa3396 (diff) | |
| download | ffmpeg-75ff0e8c50d12c40170a21479ac07f573952cdf2.tar.gz | |
Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2
* commit '01a550bda29eb05fb230576e5223034974aa3396':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Conflicts:
libavfilter/f_select.c
See: 7994c1cd760838ca5b92401caa1994bc035d08b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfenc.c')
0 files changed, 0 insertions, 0 deletions