]> git.sesse.net Git - ffmpeg/commit
Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 14:04:38 +0000 (16:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 14:04:38 +0000 (16:04 +0200)
commit8cff853b23362b0cb88e6d424e3362a437c1a6b7
tree99159042d46610fc91683654f216a47b69a87f4f
parent0a946599f881b5129c4af2f4678dca40b6668cc0
parent69f6f03cd16a09e4e848b4e82bae4993bc361cd0
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>
libavcodec/qdm2.c
libavcodec/rv10.c