[FFmpeg-cvslog] Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 20 11:36:55 2013 +0200| [ed113d7a6b2d1ff414c1127f955119643e915812] | committer: Michael Niedermayer

Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'

* commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0':
  vorbis: simplify the inner loop in setup_classifs

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed113d7a6b2d1ff414c1127f955119643e915812
---