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)
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
  h264: remove a useless svq3 condition
  mpegvideo: remove FMT_H264

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

Simple merge
Simple merge
@@@ -3398,10 -3228,8 +3398,8 @@@ static int encode_picture(MpegEncContex
          if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
              ff_mpeg1_encode_picture_header(s, picture_number);
          break;
-     case FMT_H264:
-         break;
      default:
 -        assert(0);
 +        av_assert0(0);
      }
      bits= put_bits_count(&s->pb);
      s->header_bits= bits - s->last_bits;