aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg-resampler.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-13 12:12:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 12:18:06 +0100
commited80427e0ef59e45681930810aeb821a87e80710 (patch)
treec02bbca286252598910342d2506dad25eb580d17 /doc/ffmpeg-resampler.texi
parentb13cd2d86763cddd754bab204b0893d7bf7e123b (diff)
parent0a7c4daf469d4ac447fb822fe78337f62f4c04e6 (diff)
downloadffmpeg-ed80427e0ef59e45681930810aeb821a87e80710.tar.gz
Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'
* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6': lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft Conflicts: libavformat/version.h removial postponed as the wraper code is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-resampler.texi')
0 files changed, 0 insertions, 0 deletions