aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-17 16:04:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-17 16:04:38 +0200
commit8cff853b23362b0cb88e6d424e3362a437c1a6b7 (patch)
tree99159042d46610fc91683654f216a47b69a87f4f /ffmpeg.h
parent0a946599f881b5129c4af2f4678dca40b6668cc0 (diff)
parent69f6f03cd16a09e4e848b4e82bae4993bc361cd0 (diff)
downloadffmpeg-8cff853b23362b0cb88e6d424e3362a437c1a6b7.tar.gz
Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'
* commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0': rv10: cosmetics, reformat qdm2: check that the FFT size is a power of 2 Conflicts: libavcodec/rv10.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions