diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:06:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:06:36 +0200 |
| commit | eaf64192d83270d4b3267e89c5606d385d5a1930 (patch) | |
| tree | 3fc4c925b9bc03b84a5522a325d2499c92fe980d /libavformat/utils.c | |
| parent | c074feed292eb1d9371aaa3c63136d4cb241f8c5 (diff) | |
| parent | 3a6bc3e381647bb4434317113f131f7e0ab5bf83 (diff) | |
| download | ffmpeg-eaf64192d83270d4b3267e89c5606d385d5a1930.tar.gz | |
Merge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1
* commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Conflicts:
libavfilter/f_select.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions