aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-28 21:41:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-28 21:41:19 +0100
commitfb3c33f3cd6b932badbe61a3e0d5cce9f4e36769 (patch)
tree1752b2b23e6f7058133bf844b6c783153350613f /doc/ffmpeg.texi
parentffb7d7195be6a4f25e81600a2a6a6dadd2a11e18 (diff)
parent4cb6964244fd6c099383d8b7e99731e72cc844b9 (diff)
downloadffmpeg-fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769.tar.gz
Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9': dcadec: simplify decoding of VQ high frequencies Conflicts: configure libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
0 files changed, 0 insertions, 0 deletions