Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 10:27:19 +0000 (12:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 11:25:09 +0000 (13:25 +0200)
commit215db2935b06c0e936dadce012a31de7da25ba97
tree6ba41973c6902ce6e18d9cfa31330ab5fa290da2
parentf1b04f803eafa17dbfa19977b1a76f412183478e
parentb263f8ffe7599d9cd27ec477a12700da8eb2790d
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>
doc/APIchanges
libavformat/avformat.h
libavformat/options_table.h
libavformat/utils.c
libavformat/version.h
tests/ref/lavf-fate/mp3