[FFmpeg-cvslog] Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  2 12:23:47 2013 +0200| [da4cd615023365f1af8056cbb50ac96c91af07a1] | committer: Michael Niedermayer

Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'

* commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c':
  h264_sei: Remove pointless old comment
  twinvq: Add proper twinvq prefixes to identifiers

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

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