Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jul 2011 04:39:57 +0000 (06:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jul 2011 04:46:08 +0000 (06:46 +0200)
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
200 files changed:
1  2 
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/aasc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/adxdec.c
libavcodec/adxenc.c
libavcodec/alac.c
libavcodec/alacenc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/apedec.c
libavcodec/asv1.c
libavcodec/aura.c
libavcodec/avs.c
libavcodec/bink.c
libavcodec/binkaudio.c
libavcodec/bmp.c
libavcodec/bmpenc.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/cyuv.c
libavcodec/dfa.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dv.c
libavcodec/dvbsub.c
libavcodec/dvbsubdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/escape124.c
libavcodec/ffv1.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flicvideo.c
libavcodec/flvdec.c
libavcodec/flvenc.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g726.c
libavcodec/gif.c
libavcodec/gifdec.c
libavcodec/gsmdec.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/intelh263dec.c
libavcodec/interplayvideo.c
libavcodec/jpeglsdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/lcldec.c
libavcodec/lclenc.c
libavcodec/libdiracdec.c
libavcodec/libdiracenc.c
libavcodec/libfaac.c
libavcodec/libgsm.c
libavcodec/libmp3lame.c
libavcodec/libopencore-amr.c
libavcodec/libschroedingerdec.c
libavcodec/libschroedingerenc.c
libavcodec/libspeexdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libxvidff.c
libavcodec/loco.c
libavcodec/mace.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/mlpdec.c
libavcodec/mmvideo.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpc8.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegaudioenc.c
libavcodec/mpegvideo_enc.c
libavcodec/msmpeg4.c
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/pamenc.c
libavcodec/pcm-mpeg.c
libavcodec/pcx.c
libavcodec/pcxenc.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/ptx.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/qtrleenc.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/rawenc.c
libavcodec/rl2.c
libavcodec/roqaudioenc.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/rv10.c
libavcodec/rv10enc.c
libavcodec/rv20enc.c
libavcodec/rv30.c
libavcodec/rv40.c
libavcodec/s302m.c
libavcodec/sgidec.c
libavcodec/sgienc.c
libavcodec/shorten.c
libavcodec/sipr.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/snow.c
libavcodec/sp5xdec.c
libavcodec/sunrast.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/svq3.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/truespeech.c
libavcodec/tscc.c
libavcodec/tta.c
libavcodec/txd.c
libavcodec/ulti.c
libavcodec/v210dec.c
libavcodec/v210enc.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vc1dec.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vorbisdec.c
libavcodec/vorbisenc.c
libavcodec/vp3.c
libavcodec/vp5.c
libavcodec/vp6.c
libavcodec/vp8.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/wmaprodec.c
libavcodec/wmavoice.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c
libavcodec/wnv1.c
libavcodec/ws-snd1.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_i386.h
libavcodec/x86/h264_idct.asm
libavcodec/x86/x86util.asm
libavcodec/xan.c
libavcodec/xl.c
libavcodec/xsubdec.c
libavcodec/xsubenc.c
libavcodec/xxan.c
libavcodec/yop.c
libavcodec/zmbv.c
libavcodec/zmbvenc.c
libavformat/mpegts.c
libavformat/mxfdec.c
libavformat/utils.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -120,15 -120,14 +120,14 @@@ static void clip_coefficients(DSPContex
  
  
  #if CONFIG_AC3_ENCODER
 -AVCodec ff_ac3_encoder = {
 -    .name           = "ac3",
 +AVCodec ff_ac3_float_encoder = {
-     "ac3_float",
-     AVMEDIA_TYPE_AUDIO,
-     CODEC_ID_AC3,
-     sizeof(AC3EncodeContext),
-     ff_ac3_encode_init,
-     ff_ac3_float_encode_frame,
-     ff_ac3_encode_close,
-     NULL,
++    .name           = "ac3 float",
+     .type           = AVMEDIA_TYPE_AUDIO,
+     .id             = CODEC_ID_AC3,
+     .priv_data_size = sizeof(AC3EncodeContext),
+     .init           = ff_ac3_encode_init,
+     .encode         = ff_ac3_float_encode_frame,
+     .close          = ff_ac3_encode_close,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
      .priv_class = &ac3enc_class,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/dv.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1779,15 -1737,15 +1777,15 @@@ AVCodec ff_ffv1_decoder = 
  
  #if CONFIG_FFV1_ENCODER
  AVCodec ff_ffv1_encoder = {
-     "ffv1",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_FFV1,
-     sizeof(FFV1Context),
-     encode_init,
-     encode_frame,
-     common_end,
+     .name           = "ffv1",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_FFV1,
+     .priv_data_size = sizeof(FFV1Context),
+     .init           = encode_init,
+     .encode         = encode_frame,
+     .close          = common_end,
      .capabilities = CODEC_CAP_SLICE_THREADS,
 -    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_NONE},
 +    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_NONE},
      .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
  };
  #endif
Simple merge
@@@ -1379,15 -1357,14 +1379,14 @@@ static const AVClass flac_encoder_clas
  };
  
  AVCodec ff_flac_encoder = {
-     "flac",
-     AVMEDIA_TYPE_AUDIO,
-     CODEC_ID_FLAC,
-     sizeof(FlacEncodeContext),
-     flac_encode_init,
-     flac_encode_frame,
-     flac_encode_close,
-     NULL,
+     .name           = "flac",
+     .type           = AVMEDIA_TYPE_AUDIO,
+     .id             = CODEC_ID_FLAC,
+     .priv_data_size = sizeof(FlacEncodeContext),
+     .init           = flac_encode_init,
+     .encode         = flac_encode_frame,
+     .close          = flac_encode_close,
 -    .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
 +    .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_LOSSLESS,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
      .priv_class = &flac_encoder_class,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -269,19 -215,15 +269,19 @@@ static av_cold int MP3lame_encode_close
  
  
  AVCodec ff_libmp3lame_encoder = {
-     "libmp3lame",
-     AVMEDIA_TYPE_AUDIO,
-     CODEC_ID_MP3,
-     sizeof(Mp3AudioContext),
-     MP3lame_encode_init,
-     MP3lame_encode_frame,
-     MP3lame_encode_close,
+     .name           = "libmp3lame",
+     .type           = AVMEDIA_TYPE_AUDIO,
+     .id             = CODEC_ID_MP3,
+     .priv_data_size = sizeof(Mp3AudioContext),
+     .init           = MP3lame_encode_init,
+     .encode         = MP3lame_encode_frame,
+     .close          = MP3lame_encode_close,
      .capabilities= CODEC_CAP_DELAY,
 -    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
 +    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,
 +#if 2147483647 == INT_MAX
 +    AV_SAMPLE_FMT_S32,
 +#endif
 +    AV_SAMPLE_FMT_NONE},
      .supported_samplerates= sSampleRates,
      .long_name= NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -546,16 -497,14 +546,15 @@@ static int vp8_encode(AVCodecContext *a
  }
  
  AVCodec ff_libvpx_encoder = {
-     "libvpx",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_VP8,
-     sizeof(VP8Context),
-     vp8_init,
-     vp8_encode,
-     vp8_free,
-     NULL,
-     CODEC_CAP_DELAY,
+     .name           = "libvpx",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_VP8,
+     .priv_data_size = sizeof(VP8Context),
+     .init           = vp8_init,
+     .encode         = vp8_encode,
+     .close          = vp8_free,
+     .capabilities   = CODEC_CAP_DELAY,
      .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
 +    .priv_class= &class,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -246,14 -238,12 +246,13 @@@ static av_cold int decode_end(AVCodecCo
  }
  
  AVCodec ff_pictor_decoder = {
-     "pictor",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_PICTOR,
-     sizeof(PicContext),
+     .name           = "pictor",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_PICTOR,
+     .priv_data_size = sizeof(PicContext),
 +    decode_init,
-     NULL,
-     decode_end,
-     decode_frame,
-     CODEC_CAP_DR1,
+     .close          = decode_end,
+     .decode         = decode_frame,
+     .capabilities   = CODEC_CAP_DR1,
      .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"),
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -344,13 -322,13 +344,13 @@@ static av_cold int qtrle_encode_end(AVC
  }
  
  AVCodec ff_qtrle_encoder = {
-     "qtrle",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_QTRLE,
-     sizeof(QtrleEncContext),
-     qtrle_encode_init,
-     qtrle_encode_frame,
-     qtrle_encode_end,
+     .name           = "qtrle",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_QTRLE,
+     .priv_data_size = sizeof(QtrleEncContext),
+     .init           = qtrle_encode_init,
+     .encode         = qtrle_encode_frame,
+     .close          = qtrle_encode_end,
 -    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB555BE, PIX_FMT_ARGB, PIX_FMT_NONE},
 +    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB555BE, PIX_FMT_ARGB, PIX_FMT_GRAY8, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
  };
Simple merge
@@@ -236,14 -202,12 +236,13 @@@ static av_cold int raw_close_decoder(AV
  }
  
  AVCodec ff_rawvideo_decoder = {
-     "rawvideo",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_RAWVIDEO,
-     sizeof(RawVideoContext),
-     raw_init_decoder,
-     NULL,
-     raw_close_decoder,
-     raw_decode,
+     .name           = "rawvideo",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_RAWVIDEO,
+     .priv_data_size = sizeof(RawVideoContext),
+     .init           = raw_init_decoder,
+     .close          = raw_close_decoder,
+     .decode         = raw_decode,
      .long_name = NULL_IF_CONFIG_SMALL("raw video"),
 +    .priv_class= &class,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -58,21 -58,11 +58,21 @@@ static int s302m_parse_frame_header(AVC
      /* Set output properties */
      avctx->bits_per_coded_sample = bits;
      if (bits > 16)
-         avctx->sample_fmt = SAMPLE_FMT_S32;
+         avctx->sample_fmt = AV_SAMPLE_FMT_S32;
      else
-         avctx->sample_fmt = SAMPLE_FMT_S16;
+         avctx->sample_fmt = AV_SAMPLE_FMT_S16;
  
      avctx->channels    = channels;
 +    switch(channels) {
 +        case 2:
 +            avctx->channel_layout = AV_CH_LAYOUT_STEREO;
 +            break;
 +        case 4:
 +            avctx->channel_layout = AV_CH_LAYOUT_QUAD;
 +            break;
 +        case 8:
 +            avctx->channel_layout = AV_CH_LAYOUT_5POINT1_BACK | AV_CH_LAYOUT_STEREO_DOWNMIX;
 +    }
      avctx->sample_rate = 48000;
      avctx->bit_rate    = 48000 * avctx->channels * (avctx->bits_per_coded_sample + 4) +
                           32 * (48000 / (buf_size * 8 /
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -118,13 -118,12 +118,12 @@@ static av_cold int encode_close(AVCodec
  }
  
  AVCodec ff_v210_encoder = {
-     "v210",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_V210,
-     0,
-     encode_init,
-     encode_frame,
-     encode_close,
+     .name           = "v210",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_V210,
+     .init           = encode_init,
+     .encode         = encode_frame,
+     .close          = encode_close,
 -    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P16, PIX_FMT_NONE},
 +    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
  };
Simple merge
diff --cc libavcodec/vb.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -471,15 -471,15 +471,14 @@@ static av_cold int wmv2_decode_end(AVCo
  }
  
  AVCodec ff_wmv2_decoder = {
-     "wmv2",
-     AVMEDIA_TYPE_VIDEO,
-     CODEC_ID_WMV2,
-     sizeof(Wmv2Context),
-     wmv2_decode_init,
-     NULL,
-     wmv2_decode_end,
-     ff_h263_decode_frame,
-     CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+     .name           = "wmv2",
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = CODEC_ID_WMV2,
+     .priv_data_size = sizeof(Wmv2Context),
+     .init           = wmv2_decode_init,
+     .close          = wmv2_decode_end,
+     .decode         = ff_h263_decode_frame,
+     .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
 -    .max_lowres = 3,
      .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
      .pix_fmts= ff_pixfmt_list_420,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/xl.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge