diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-30 13:41:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-30 13:41:43 +0100 |
| commit | 89ec4f4d5eb9d2c60ccec2f4c14e19949ae77326 (patch) | |
| tree | e857be124197182f784a2437007ffefbc450367e /libavformat/mpegts.c | |
| parent | 612d9cdbe90a9cb0319b093efa54efa71bb1e4c4 (diff) | |
| parent | 670bb1c9795f2647d89669b293ea2fce3d64d594 (diff) | |
| download | ffmpeg-89ec4f4d5eb9d2c60ccec2f4c14e19949ae77326.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with --enable-decoder=webp --disable-decoder=vp8
Do not show "Estimating duration from bitrate" warning if no duration was estimated.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions