diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 11:36:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 11:54:19 +0100 |
commit | a75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b (patch) | |
tree | 7138bf498875f924a2019739e2c05a8a7249765a /libavcodec/h264addpx_template.c | |
parent | 8a701ef7ddbb2d80ef77b14287d286fc9760f131 (diff) | |
parent | 34a0ac41a880039c7fb4b3abce10d8e2ce48fac7 (diff) | |
download | ffmpeg-a75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b.tar.gz |
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
vf_aspect: support variables in evaluating the aspect ratios
Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264addpx_template.c')
0 files changed, 0 insertions, 0 deletions