aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpc8data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-03 12:23:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-03 12:31:21 +0100
commit7edc9240a8f424fdcb30efeed127ffca8145774a (patch)
tree7138bf498875f924a2019739e2c05a8a7249765a /libavcodec/mpc8data.h
parenta75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b (diff)
parent3a14b160bd442794c6a16a6a883adb547550e847 (diff)
downloadffmpeg-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 'libavcodec/mpc8data.h')
0 files changed, 0 insertions, 0 deletions