]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdb2e80 ad0fe2f)
Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 23:24:26 +0000 (01:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 23:24:48 +0000 (01:24 +0200)
* commit 'ad0fe2f4012031c47268f14b9835088c488e1998':
  af_resample: Use avresample_get_out_samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/af_resample.c patch | diff1 | diff2 | blob | history

diff --cc libavfilter/af_resample.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.