aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_elbg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 18:47:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 18:50:53 +0100
commit3d1d8e1f95e1cb6682a6dd035046d91a0812d331 (patch)
tree01ed80b8f00c484de9ed9330c802ce3407c6e45c /libavfilter/vf_elbg.c
parent27301633297f36549d94499b1c5728e1118a2b7c (diff)
parent36d04801ba9d8622c2d759c172aea18561bac74d (diff)
downloadffmpeg-3d1d8e1f95e1cb6682a6dd035046d91a0812d331.tar.gz
Merge commit '36d04801ba9d8622c2d759c172aea18561bac74d'
* commit '36d04801ba9d8622c2d759c172aea18561bac74d': h264: move the scratch buffers into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_slice.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_elbg.c')
0 files changed, 0 insertions, 0 deletions