diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-29 17:29:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-29 17:29:13 +0200 |
| commit | e55e5be982a6d2429e9fc3516683da4c30b179f4 (patch) | |
| tree | dfa04eb77d2879ec9588dc0cf2e29bc48e6b67b2 /libavfilter/avf_showvolume.c | |
| parent | 7c10b87b5744179f16411f5981e96738021ec7ca (diff) | |
| parent | 4b920d7b4a588f0625ac73649729ba5229e9449f (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
lavf/mpegts: Return 0 if the probe function does not detect mpegts.
lavf/img2dec: Improve detection of valid Quickdraw images.
lavf/asfdec: Reduce minimum header size.
Changelog: Add jpeg 2000 improvements before they get forgotten.
lavf/img2dec: Autodetect dds frames.
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_showvolume.c')
0 files changed, 0 insertions, 0 deletions