aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_settb.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-12 20:01:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-12 20:01:58 +0200
commit854fa0d1ab35c18764e020828531b4ababa67e6c (patch)
tree73de8ebfe730b609d1bcbba27c5d5af5f6543851 /libavfilter/vf_settb.c
parent5d790cdb9ee28f1f72d49f80fdbb257ba5258ab8 (diff)
parente24d1cbc4e134e0b4448b3bc3a80f3197271b347 (diff)
downloadffmpeg-854fa0d1ab35c18764e020828531b4ababa67e6c.tar.gz
Merge commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347' into release/0.10
* commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347': lavf: Fix leftovers from the ff_get_buffer patch Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_settb.c')
0 files changed, 0 insertions, 0 deletions