aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/svq13.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-06 23:47:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-06 23:47:10 +0100
commit90f8b2ce48cfbffeb64779a8c2d55a1e078b4657 (patch)
treea077687783a032b52a7b03a9f63d29925d516568 /libavcodec/svq13.c
parent09131ebb562472effd81726c2c14c3ec7164b695 (diff)
parent4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a (diff)
downloadffmpeg-90f8b2ce48cfbffeb64779a8c2d55a1e078b4657.tar.gz
Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'
* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a': shorten: report meaningful errors Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq13.c')
0 files changed, 0 insertions, 0 deletions