aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-13 14:35:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-13 14:35:42 +0200
commitd6c342fdc0b434b514f99e1feaa108ab17bba806 (patch)
tree244b8c09cff87b34e1c94cfe3e8e2e15b415ce3c /ffmpeg.h
parentd197bd4f5ee752c95ebaf7d94257ca5121309674 (diff)
parentd5c62122a7b26704bf867a1262df358623bf5edf (diff)
downloadffmpeg-d6c342fdc0b434b514f99e1feaa108ab17bba806.tar.gz
Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
* commit 'd5c62122a7b26704bf867a1262df358623bf5edf': Move av_reverse table to libavcodec Conflicts: libavcodec/asvenc.c libavcodec/vble.c libavutil/common.h libavutil/mathematics.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions