diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-15 23:16:23 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-15 23:17:32 +0100 |
| commit | e887d685f74197cda153c0ec57f9cb719a33932b (patch) | |
| tree | 7cd6b72200d887eb3a56930e54c6c4d844cf7840 /libavcodec/mlp_parser.h | |
| parent | dd0abace3ec73d253486a0dd19f43dd9263f8a2f (diff) | |
| parent | ed1cd81076434b76f37576d4d806973476a8e96c (diff) | |
| download | ffmpeg-e887d685f74197cda153c0ec57f9cb719a33932b.tar.gz | |
Merge commit 'ed1cd81076434b76f37576d4d806973476a8e96c'
* commit 'ed1cd81076434b76f37576d4d806973476a8e96c':
flac demuxer: improve probing
Suggested commit very closely matches our code, except with regards to
AVPROBE_SCORE_EXTENSION. The code layout is mostly merged but preserves
our behaviour.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/mlp_parser.h')
0 files changed, 0 insertions, 0 deletions