diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 17:32:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 17:32:15 +0200 |
| commit | 7994c1cd760838ca5b92401caa1994bc035d08b5 (patch) | |
| tree | d4675355588799c91ff395935d1bff24208f1989 /libavcodec/aacenc.h | |
| parent | 91244073fd8b983e7cd1f97da83daf956fbbddc6 (diff) | |
| parent | a8d803a320fb08b3ad5db4fffc79abd401206905 (diff) | |
| download | ffmpeg-7994c1cd760838ca5b92401caa1994bc035d08b5.tar.gz | |
Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'
* commit 'a8d803a320fb08b3ad5db4fffc79abd401206905':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Conflicts:
libavfilter/f_select.c
Not merged, see next commit for the bugfix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.h')
0 files changed, 0 insertions, 0 deletions