aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-10 23:48:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-10 23:49:58 +0200
commitf42635a50b7af62b120c09e98dbd4a12f4d1e4b5 (patch)
tree562ffbe8d57fdb4fdd7b5d9681eea61b55d81e47 /libavcodec/x86
parent270d3c96ec492e004275fdb7fd625f801fd1a26b (diff)
parent33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff (diff)
downloadffmpeg-f42635a50b7af62b120c09e98dbd4a12f4d1e4b5.tar.gz
Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'
* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff': vf_setpts: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/f_setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions