aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/wtvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-25 12:27:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-25 13:25:09 +0200
commit215db2935b06c0e936dadce012a31de7da25ba97 (patch)
tree6ba41973c6902ce6e18d9cfa31330ab5fa290da2 /libavformat/wtvdec.c
parentf1b04f803eafa17dbfa19977b1a76f412183478e (diff)
parentb263f8ffe7599d9cd27ec477a12700da8eb2790d (diff)
downloadffmpeg-215db2935b06c0e936dadce012a31de7da25ba97.tar.gz
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>
Diffstat (limited to 'libavformat/wtvdec.c')
0 files changed, 0 insertions, 0 deletions