Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  cmdutils: use new avcodec_is_decoder/encoder() functions.
  lavc: make codec_is_decoder/encoder() public.
  lavc: deprecate AVCodecContext.sub_id.
  libcdio: add a forgotten AVClass to the private context.
  swscale: remove "cpu flags" from -sws_flags description.
  proresenc: give user a possibility to alter some encoding parameters
  vorbisenc: add output buffer overwrite protection
  libopencore-amrnbenc: fix end-of-stream handling
  ra144enc: fix end-of-stream handling
  nellymoserenc: zero any leftover packet bytes
  nellymoserenc: use proper MDCT overlap delay
  qpeg: Use bytestream2 functions to prevent buffer overreads.
  swscale: make %rep unconditional.
  vp8: convert simple loopfilter x86 assembly to use named arguments.
  vp8: convert idct x86 assembly to use named arguments.
  vp8: convert mc x86 assembly to use named arguments.
  vp8: convert loopfilter x86 assembly to use cpuflags().
  vp8: convert idct/mc x86 assembly to use cpuflags().
  swscale: remove now unnecessary hack.
  x86inc: don't "bake" stack_offset in named arguments.
  ...

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/qpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavdevice/libcdio.c
	tests/lavf-regression.sh

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

diff --cc cmdutils.c
Simple merge

diff --cc doc/APIchanges
index b579e82,ef630e8..699ab28
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -13,28 -12,9 +13,31 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
 +2012-02-21 - xxxxxxx - lavc 54.4.100
 +  Add av_get_pcm_codec() function.
 +
 +2012-02-16 - xxxxxxx - libswr 0.7.100
 +  Add swr_set_matrix() function.
 +
 +2012-02-09 - xxxxxxx - lavu 51.39.100
 +  Add a new installed header libavutil/timestamp.h with timestamp
 +  utilities.
 +
 +2012-02-06 - xxxxxxx - lavu 51.38.100
 +  Add av_parse_ratio() function to parseutils.h.
 +
 +2012-02-06 - xxxxxxx - lavu 51.38.100
 +  Add AV_LOG_MAX_OFFSET macro to log.h.
 +
 +2012-02-02 - xxxxxxx - lavu 51.37.100
 +  Add public timecode helpers.
 +
 +2012-01-24 - xxxxxxx - lavfi 2.60.100
 +  Add avfilter_graph_dump.
 +
+ 2012-03-xx - xxxxxxx - lavc 54.7.0 - avcodec.h
+   Add av_codec_is_encoder/decoder().
+ 
  2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h
    Add av_packet_shrink_side_data.
  

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/libopencore-amr.c
Simple merge

diff --cc libavcodec/mpeg12.c
index 5c5e09e,c49343f..548e26d
--- 1/libavcodec/mpeg12.c
--- 2/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@@ -2092,18 -2054,9 +2089,16 @@@ static int vcr2_init_sequence(AVCodecCo
      s->progressive_sequence  = 1;
      s->progressive_frame     = 1;
      s->picture_structure     = PICT_FRAME;
 +    s->first_field           = 0;
      s->frame_pred_frame_dct  = 1;
      s->chroma_format         = 1;
 -    s->codec_id              = s->avctx->codec_id = CODEC_ID_MPEG2VIDEO;
 +    if (s->codec_tag == AV_RL32("BW10")) {
 +        s->codec_id              = s->avctx->codec_id = CODEC_ID_MPEG1VIDEO;
-         avctx->sub_id            = 1; /* indicates MPEG-1 */
 +    } else {
 +        exchange_uv(s); // common init reset pblocks, so we swap them here
 +        s->swap_uv = 1; // in case of xvmc we need to swap uv for each MB
 +        s->codec_id              = s->avctx->codec_id = CODEC_ID_MPEG2VIDEO;
-         avctx->sub_id            = 2; /* indicates MPEG-2 */
 +    }
      s1->save_width           = s->width;
      s1->save_height          = s->height;
      s1->save_progressive_seq = s->progressive_sequence;

diff --cc libavcodec/mpegaudiodec.c
Simple merge

diff --cc libavcodec/mpegaudiodecheader.c
Simple merge

diff --cc libavcodec/mpegvideo_parser.c
Simple merge

diff --cc libavcodec/nellymoserenc.c
Simple merge

diff --cc libavcodec/options.c
index 04277db,51187b8..9aae191
--- 1/libavcodec/options.c
--- 2/libavcodec/options.c
+++ b/libavcodec/options.c
@@@ -110,8 -109,9 +110,10 @@@ static const AVOption options[]=
  #endif
  {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"},
  {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"},
 +{"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"},
+ #if FF_API_SUB_ID
  {"sub_id", NULL, OFFSET(sub_id), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
+ #endif
  {"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.dbl = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"},
  {"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.dbl = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" },
  {"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.dbl = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" },

diff --cc libavcodec/proresenc_kostya.c
Simple merge

diff --cc libavcodec/pthread.c
Simple merge

diff --cc libavcodec/qpeg.c
index 2d5ae69,f8cbef3..a0ddfae
--- 1/libavcodec/qpeg.c
--- 2/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@@ -28,12 -29,14 +29,13 @@@
  
  typedef struct QpegContext{
      AVCodecContext *avctx;
 -    AVFrame pic;
 -    uint8_t *refdata;
 +    AVFrame pic, ref;
      uint32_t pal[256];
+     GetByteContext buffer;
  } QpegContext;
  
- static int qpeg_decode_intra(const uint8_t *src, uint8_t *dst, int size,
-                             int stride, int width, int height)
+ static void qpeg_decode_intra(QpegContext *qctx, uint8_t *dst,
+                               int stride, int width, int height)
  {
      int i;
      int code;
@@@ -143,7 -133,7 +135,7 @@@ static void qpeg_decode_inter(QpegConte
  
          if(delta) {
              /* motion compensation */
-             while(size > 0 && (code & 0xF0) == 0xF0) {
 -            while((code & 0xF0) == 0xF0) {
++            while(bytestream2_get_bytes_left(&qctx->buffer) > 0 && (code & 0xF0) == 0xF0) {
                  if(delta == 1) {
                      int me_idx;
                      int me_w, me_h, me_x, me_y;
@@@ -210,20 -195,14 +199,19 @@@
          } else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */
              code &= 0x1F;
  
-             if(code + 1 > size)
++            if(code + 1 > bytestream2_get_bytes_left(&qctx->buffer))
 +                break;
 +
              for(i = 0; i <= code; i++) {
-                 dst[filled++] = *src++;
+                 dst[filled++] = bytestream2_get_byte(&qctx->buffer);
                  if(filled >= width) {
                      filled = 0;
                      dst -= stride;
                      height--;
 +                    if(height < 0)
 +                        break;
                  }
              }
-             size -= code + 1;
          } else if(code >= 0x80) { /* skip code: 0x80..0xBF */
              int skip;
  
@@@ -263,35 -243,36 +252,42 @@@ static int decode_frame(AVCodecContext 
                          void *data, int *data_size,
                          AVPacket *avpkt)
  {
-     const uint8_t *buf = avpkt->data;
-     int buf_size = avpkt->size;
+     uint8_t ctable[128];
      QpegContext * const a = avctx->priv_data;
 -    AVFrame * const p = &a->pic;
 +    AVFrame *  p = &a->pic;
 +    AVFrame * ref= &a->ref;
      uint8_t* outdata;
 -    int delta;
 +    int delta, ret = 0;
      const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
  
 -    p->reference = 3;
 -    if (avctx->reget_buffer(avctx, p) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+     if (avpkt->size < 0x86) {
+         av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+         return AVERROR_INVALIDDATA;
+     }
+ 
+     bytestream2_init(&a->buffer, avpkt->data, avpkt->size);
++
 +    if(ref->data[0])
 +        avctx->release_buffer(avctx, ref);
 +    FFSWAP(AVFrame, *ref, *p);
 +
 +    p->reference= 3;
 +    if(avctx->get_buffer(avctx, p) < 0){
 +        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
          return -1;
      }
      outdata = a->pic.data[0];
-     if(buf[0x85] == 0x10) {
-         ret = qpeg_decode_intra(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height);
+     bytestream2_skip(&a->buffer, 4);
+     bytestream2_get_buffer(&a->buffer, ctable, 128);
+     bytestream2_skip(&a->buffer, 1);
+ 
+     delta = bytestream2_get_byte(&a->buffer);
+     if(delta == 0x10) {
+         qpeg_decode_intra(a, outdata, a->pic.linesize[0], avctx->width, avctx->height);
      } else {
-         delta = buf[0x85];
-         qpeg_decode_inter(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height, delta, buf + 4, a->ref.data[0]);
 -        qpeg_decode_inter(a, outdata, a->pic.linesize[0], avctx->width, avctx->height, delta, ctable, a->refdata);
++        qpeg_decode_inter(a, outdata, a->pic.linesize[0], avctx->width, avctx->height, delta, ctable, a->ref.data[0]);
      }
  
-     if (ret<0)
-         return ret;
- 
      /* make the palette available on the way out */
      if (pal) {
          a->pic.palette_has_changed = 1;

diff --cc libavcodec/ra144.h
Simple merge

diff --cc libavcodec/ra144enc.c
Simple merge

diff --cc libavcodec/rv10.c
Simple merge

diff --cc libavcodec/utils.c
index 47e29c9,d438410..6c49905
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -913,11 -811,6 +913,11 @@@ int attribute_align_arg avcodec_open2(A
              goto free_and_end;
          }
      }
-     if (codec_is_decoder(avctx->codec) && !avctx->bit_rate)
 +
++    if (av_codec_is_decoder(avctx->codec) && !avctx->bit_rate)
 +        avctx->bit_rate = get_bit_rate(avctx);
 +
 +    ret=0;
  end:
      entangled_thread_counter--;
  
@@@ -1554,9 -1384,8 +1554,9 @@@ AVCodec *avcodec_find_encoder(enum Code
  {
      AVCodec *p, *experimental=NULL;
      p = first_avcodec;
 +    id= remap_deprecated_codec_id(id);
      while (p) {
-         if (codec_is_encoder(p) && p->id == id) {
+         if (av_codec_is_encoder(p) && p->id == id) {
              if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {
                  experimental = p;
              } else
@@@ -1583,19 -1412,14 +1583,19 @@@ AVCodec *avcodec_find_encoder_by_name(c
  
  AVCodec *avcodec_find_decoder(enum CodecID id)
  {
 -    AVCodec *p;
 +    AVCodec *p, *experimental=NULL;
      p = first_avcodec;
 +    id= remap_deprecated_codec_id(id);
      while (p) {
-         if (codec_is_decoder(p) && p->id == id) {
 -        if (av_codec_is_decoder(p) && p->id == id)
 -            return p;
++        if (av_codec_is_decoder(p) && p->id == id) {
 +            if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {
 +                experimental = p;
 +            } else
 +                return p;
 +        }
          p = p->next;
      }
 -    return NULL;
 +    return experimental;
  }
  
  AVCodec *avcodec_find_decoder_by_name(const char *name)

diff --cc libavcodec/version.h
index 99691f2,1ecfb21..b8d2bbf
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -21,8 -21,8 +21,8 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 54
--#define LIBAVCODEC_VERSION_MINOR  7
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  8
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \

diff --cc libavcodec/vorbisenc.c
Simple merge

diff --cc libavcodec/wmaenc.c
Simple merge

diff --cc libavcodec/x86/vp8dsp-init.c
Simple merge

diff --cc libavcodec/x86/vp8dsp.asm
Simple merge

diff --cc libavutil/x86/x86inc.asm
Simple merge

diff --cc libswscale/options.c
Simple merge

diff --cc libswscale/x86/output.asm
Simple merge

diff --cc tests/lavf-regression.sh
index 8936357,49d2dfc..bfca359
--- 1/tests/lavf-regression.sh
--- 2/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@@ -219,11 -183,7 +219,11 @@@ if [ -n "$do_dpx" ] ; the
  do_image_formats dpx
  fi
  
- if [ -n "$do_sun" ] ; then
 +if [ -n "$do_xwd" ] ; then
 +do_image_formats xwd
 +fi
 +
+ if [ -n "$do_sunrast" ] ; then
  do_image_formats sun
  fi