Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 10:16:49 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 10:17:35 +0000 (12:17 +0200)
commit4c404611dae4a8fe41b348b8d5db4ea526e24bc5
treeab0733f41b30dcf0130893a6718e84985f272d86
parent7c73d215231adcf81c03c95caf5ed1f0c33c727b
parentef17a0c7ba005fafd05e7d9f0ff294a59265a2dc
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.

Merged-by: Michael Niedermayer <michaelni@gmx.at>