diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:24:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:24:48 +0200 |
commit | 20343cfb51ea234500ce9c9c39b79287f44de4f7 (patch) | |
tree | 2302b11983f7124e033685168714b9c65773b49f /libavformat/nutenc.c | |
parent | bdb2e80e88e76cc39c6d85a8f1c1712d36e18966 (diff) | |
parent | ad0fe2f4012031c47268f14b9835088c488e1998 (diff) | |
download | ffmpeg-20343cfb51ea234500ce9c9c39b79287f44de4f7.tar.gz |
Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998'
* commit 'ad0fe2f4012031c47268f14b9835088c488e1998':
af_resample: Use avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions