aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avisynth.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-13 13:56:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-13 13:57:07 +0200
commit67d5d97cdcd7ada748320edf34453d94668a67c6 (patch)
treeda43716d756a1c8f08632a376c4da26ce5a9db8d /libavformat/avisynth.c
parentdbddd587e13b9bf718ee0eb0d183be6d8ffb996f (diff)
parentbe373cb50d3c411366fec7eef2eb3681abe48f96 (diff)
downloadffmpeg-67d5d97cdcd7ada748320edf34453d94668a67c6.tar.gz
Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'
* commit 'be373cb50d3c411366fec7eef2eb3681abe48f96': 4xm: do not overread the prestream buffer Conflicts: libavcodec/4xm.c See: 9c661e95 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avisynth.c')
0 files changed, 0 insertions, 0 deletions