Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Apr 2011 00:28:01 +0000 (02:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Apr 2011 00:28:01 +0000 (02:28 +0200)
* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
22 files changed:
1  2 
libavcodec/avcodec.h
libavcodec/fft-internal.h
libavcodec/fft.c
libavcodec/fft.h
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/jvdec.c
libavcodec/mdct_fixed.c
libavcodec/mlp_parser.c
libavcodec/mpeg12.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/options.c
libavcodec/parser.c
libavcodec/pthread.c
libavcodec/rv34.c
libavcodec/svq1dec.c
libavcodec/svq3.c
libavcodec/vc1dec.c
libavformat/jvdec.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -3350,7 -2853,13 +3354,10 @@@ static int decode_nal_units(H264Contex
                      ff_vdpau_h264_picture_start(s);
              }
  
-             if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
 -            s->current_picture_ptr->key_frame |=
 -                    (hx->nal_unit_type == NAL_IDR_SLICE) ||
 -                    (h->sei_recovery_frame_cnt >= 0);
+             if(hx->redundant_pic_count==0
+ #if FF_API_HURRY_UP
+                && hx->s.hurry_up < 5
+ #endif
                 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
                 && (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
                 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
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