[FFmpeg-cvslog] Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 13:17:43 2013 +0100| [6c3e4e391dc881233e0cb96311da5a48a85a0eaf] | committer: Michael Niedermayer

Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'

* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
  h264: remove a useless svq3 condition
  mpegvideo: remove FMT_H264

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

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