diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 12:23:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 12:31:21 +0100 |
| commit | 7edc9240a8f424fdcb30efeed127ffca8145774a (patch) | |
| tree | 7138bf498875f924a2019739e2c05a8a7249765a /libavfilter/af_asetnsamples.c | |
| parent | a75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b (diff) | |
| parent | 3a14b160bd442794c6a16a6a883adb547550e847 (diff) | |
| download | ffmpeg-7edc9240a8f424fdcb30efeed127ffca8145774a.tar.gz | |
Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'
* commit '3a14b160bd442794c6a16a6a883adb547550e847':
vf_scale: make the dar variable return the DAR.
Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h
See: 61d55fda2b513caf18e37b27aba680a87840904a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asetnsamples.c')
0 files changed, 0 insertions, 0 deletions