Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)
* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
  videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
  dsputil: drop non-compliant "fast" qpel mc functions
  get_bits: change the failure condition in init_get_bits

Conflicts:
libavcodec/get_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/videodsp_armv5te.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/get_bits.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c

Simple merge
Simple merge
Simple merge
@@@ -379,7 -375,7 +379,7 @@@ static inline int init_get_bits(GetBitC
      int buffer_size;
      int ret = 0;
  
-     if (bit_size >= INT_MAX - 7 || bit_size < 0) {
 -    if (bit_size > INT_MAX - 7 || bit_size < 0 || !buffer) {
++    if (bit_size >= INT_MAX - 7 || bit_size < 0 || !buffer) {
          buffer_size = bit_size = 0;
          buffer = NULL;
          ret = AVERROR_INVALIDDATA;
Simple merge
@@@ -2663,20 -2591,12 +2663,13 @@@ static int decode_slice_header(H264Cont
      unsigned int slice_type, tmp, i, j;
      int default_ref_list_done = 0;
      int last_pic_structure, last_pic_droppable;
 +    int must_reinit;
      int needs_reinit = 0;
  
-     /* FIXME: 2tap qpel isn't implemented for high bit depth. */
-     if ((s->avctx->flags2 & CODEC_FLAG2_FAST) &&
-         !h->nal_ref_idc && !h->pixel_shift) {
-         s->me.qpel_put = s->dsp.put_2tap_qpel_pixels_tab;
-         s->me.qpel_avg = s->dsp.avg_2tap_qpel_pixels_tab;
-     } else {
-         s->me.qpel_put = s->dsp.put_h264_qpel_pixels_tab;
-         s->me.qpel_avg = s->dsp.avg_h264_qpel_pixels_tab;
-     }
+     s->me.qpel_put = s->dsp.put_h264_qpel_pixels_tab;
+     s->me.qpel_avg = s->dsp.avg_h264_qpel_pixels_tab;
  
 -    first_mb_in_slice = get_ue_golomb(&s->gb);
 +    first_mb_in_slice = get_ue_golomb_long(&s->gb);
  
      if (first_mb_in_slice == 0) { // FIXME better field boundary detection
          if (h0->current_slice && FIELD_PICTURE) {
Simple merge
Simple merge