Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2014-07-30 17:32:15 +02:00

parent 91244073fd a8d803a320

commit 7994c1cd76

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available