[FFmpeg-cvslog] Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  7 01:35:12 2013 +0100| [ea93ccf07991dbb0d90b913c0bf49f680fdc0ffc] | committer: Michael Niedermayer

Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'

* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
  x86: ABS1: port to cpuflags
  v210x: cosmetics, reformat

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

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