Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 May 2011 02:53:19 +0000 (04:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 May 2011 02:53:19 +0000 (04:53 +0200)
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
Changelog
libavcodec/svq3.c
libavcodec/x86/dct32_sse.c
libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
53 files changed:
1  2 
ffmpeg.c
libavcodec/aac_tablegen.h
libavcodec/aac_tablegen_decl.h
libavcodec/amrwbdata.h
libavcodec/arm/asm-offsets.h
libavcodec/arm/dsputil_arm.h
libavcodec/arm/mpegvideo_arm.h
libavcodec/arm/vp56_arith.h
libavcodec/arm/vp8.h
libavcodec/cavsdsp.h
libavcodec/cbrt_tablegen.h
libavcodec/cga_data.h
libavcodec/dct.h
libavcodec/dctref.h
libavcodec/dv_tablegen.h
libavcodec/flv.h
libavcodec/gsmdec_data.h
libavcodec/h263.h
libavcodec/kbdwin.h
libavcodec/motionpixels_tablegen.h
libavcodec/mpeg4video.h
libavcodec/mpegaudio_tablegen.h
libavcodec/mpegaudiodec.c
libavcodec/msgsmdec.h
libavcodec/pcm_tablegen.h
libavcodec/qdm2_tablegen.h
libavcodec/rdft.h
libavcodec/sh4/dsputil_sh4.h
libavcodec/sinewin.h
libavcodec/sinewin_tablegen.h
libavcodec/sparc/dsputil_vis.h
libavcodec/svq3.c
libavcodec/targa.h
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/x86/Makefile
libavcodec/x86/fft.c
libavcodec/x86/fft.h
libavcodec/xvmc_internal.h
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/internal.h
libavformat/avio.h
libavformat/avio_internal.h
libavformat/aviobuf.c
libavformat/ffmeta.h
libavformat/mms.h
libavformat/spdif.h
libavformat/url.h
libavformat/version.h
libavutil/avassert.h
libavutil/cpu.h
libswscale/swscale.h

diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -216,9 -206,8 +216,8 @@@ static int video_sync_method= -1
  static int audio_sync_method= 0;
  static float audio_drift_threshold= 0.1;
  static int copy_ts= 0;
 -static int copy_tb;
 +static int copy_tb= 0;
  static int opt_shortest = 0;
- static int video_global_header = 0;
  static char *vstats_filename;
  static FILE *vstats_file;
  static int opt_programid = 0;
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
@@@ -819,21 -804,11 +819,12 @@@ static av_cold int svq3_decode_init(AVC
      avctx->pix_fmt = avctx->codec->pix_fmts[0];
  
      if (!s->context_initialized) {
-         s->width  = avctx->width;
-         s->height = avctx->height;
 -        h->halfpel_flag      = 1;
 -        h->thirdpel_flag     = 1;
 -        h->unknown_svq3_flag = 0;
 -        h->chroma_qp[0]      = h->chroma_qp[1] = 4;
 +        h->chroma_qp[0] = h->chroma_qp[1] = 4;
 +
 +        svq3->halfpel_flag = 1;
 +        svq3->thirdpel_flag = 1;
 +        svq3->unknown_flag = 0;
  
-         if (MPV_common_init(s) < 0)
-             return -1;
-         h->b_stride = 4*s->mb_width;
-         ff_h264_alloc_tables(h);
          /* prowl for the "SEQH" marker in the extradata */
          extradata = (unsigned char *)avctx->extradata;
          for (m = 0; m < avctx->extradata_size; m++) {
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 libavutil/cpu.h
Simple merge
Simple merge