aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_idet.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-18 14:09:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-18 14:10:56 +0200
commit4fac4447d153b2a8e88ce7274b851459d7cd93f6 (patch)
treed1996e13fdfd392ee530b2bea60c029acc0923c9 /libavfilter/vf_idet.c
parent213e82b55c28d28860ec9a7ace8335df860a4c50 (diff)
parentab3fdaa7131e2fd8e33006daea25a282724c01f0 (diff)
downloadffmpeg-4fac4447d153b2a8e88ce7274b851459d7cd93f6.tar.gz
Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'
* commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0': yop: only set extradata size after it has been successfully allocated Conflicts: libavformat/yop.c See: a807c68253b02cce8b9fbc87d7857c31d531a1ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_idet.c')
0 files changed, 0 insertions, 0 deletions