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

..

acodec

adpcm: Write the proper predictor in trellis mode in IMA QT

2014-06-06 17:08:21 +02:00

fate

avfilter: add codecview filter

2014-08-24 14:35:11 +02:00

lavf

avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation

2014-08-09 05:05:09 +02:00

lavf-fate

Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'

2014-08-25 13:25:09 +02:00

seek

avcodec/roqvideo: use JPEG color range

2014-07-06 23:34:58 +02:00

vsynth

fate: add test for old (v1) huffyuv and rgba

2014-08-21 02:20:07 +02:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth2

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00