projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9124407 a8d803a)
Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 15:32:15 +0000 (17:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 15:32:15 +0000 (17:32 +0200)
* 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>

Trivial merge
FFmpeg git repo