Michael Niedermayer 215db2935b Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d' ... * commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d': lavf: add AVFormatContext.max_ts_probe Conflicts: doc/APIchanges libavformat/avformat.h libavformat/utils.c libavformat/version.h lavf-fate/mp3 changes as the estimated input bitrate changes and that is copied to the output Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-08-25 13:25:09 +02:00
..
latm
mp3	Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'	2014-08-25 13:25:09 +02:00
ogg_vp3