aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/nutenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-29 01:18:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-29 01:23:22 +0200
commitbdb2e80e88e76cc39c6d85a8f1c1712d36e18966 (patch)
tree230646af1610b055a198af67574b1d823fc50d76 /libavformat/nutenc.c
parenta8499cbbe87d00456c391f41207e1981bd7f746a (diff)
parentb2d45654220503224aa94e78cdff19ec624e9342 (diff)
downloadffmpeg-bdb2e80e88e76cc39c6d85a8f1c1712d36e18966.tar.gz
Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'
* commit 'b2d45654220503224aa94e78cdff19ec624e9342': avresample: Add avresample_get_out_samples Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions