Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:17:43 +0000 (13:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:17:49 +0000 (13:17 +0100)
commit6c3e4e391dc881233e0cb96311da5a48a85a0eaf
tree6e2f02bbca19aaa148c7d901e491d4afab4c63b4
parent72ad824a86233fb0c81a1581a1a7e6468dca6b0f
parentf08fefc4d099f2a1f2e3a6db3d340537e601f762
Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c