diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 12:16:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 12:17:35 +0200 |
| commit | 4c404611dae4a8fe41b348b8d5db4ea526e24bc5 (patch) | |
| tree | ab0733f41b30dcf0130893a6718e84985f272d86 /CREDITS | |
| parent | 7c73d215231adcf81c03c95caf5ed1f0c33c727b (diff) | |
| parent | ef17a0c7ba005fafd05e7d9f0ff294a59265a2dc (diff) | |
| download | ffmpeg-streaming-4c404611dae4a8fe41b348b8d5db4ea526e24bc5.zip ffmpeg-streaming-4c404611dae4a8fe41b348b8d5db4ea526e24bc5.tar.gz | |
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>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions
