Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Dec 2011 22:21:37 +0000 (23:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Dec 2011 22:21:37 +0000 (23:21 +0100)
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
libavcodec/h264.c
libavcodec/vc1dec.c
libavfilter/vf_yadif.c
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
26 files changed:
1  2 
Makefile
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/intrax8.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/ulti.c
libavcodec/vc1dec.c
libavdevice/Makefile
libavfilter/Makefile
libavfilter/vf_yadif.c
libavformat/Makefile
libavformat/utils.c
libavutil/Makefile
libpostproc/Makefile
libswresample/Makefile
libswscale/Makefile
tests/ref/fate/wmv8-drm

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -3695,9 -3658,8 +3695,9 @@@ static int decode_slice(struct AVCodecC
                  if(s->mb_y >= s->mb_height){
                      tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
  
 -                    if(get_bits_count(&s->gb) == s->gb.size_in_bits ) {
 +                    if(   get_bits_count(&s->gb) == s->gb.size_in_bits
 +                       || get_bits_count(&s->gb) <  s->gb.size_in_bits && s->avctx->error_recognition < FF_ER_AGGRESSIVE) {
-                         ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
+                         ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END&part_mask);
  
                          return 0;
                      }else{
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -224,8 -231,9 +232,9 @@@ static int ulti_decode_frame(AVCodecCon
      int i;
      int skip;
      int tmp;
+     const uint8_t *buf_end = buf + buf_size;
  
 -    s->frame.reference = 1;
 +    s->frame.reference = 3;
      s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
      if (avctx->reget_buffer(avctx, &s->frame) < 0) {
          av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
Simple merge
Simple merge
@@@ -95,73 -67,10 +95,71 @@@ OBJS-$(CONFIG_NULLSRC_FILTER
  OBJS-$(CONFIG_RGBTESTSRC_FILTER)             += vsrc_testsrc.o
  OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o
  
 +OBJS-$(CONFIG_BUFFERSINK_FILTER)             += sink_buffer.o
  OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
  
 +
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_2xsai.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_decimate.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_denoise3d.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_detc.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_divtc.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_down3dright.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dsize.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_field.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o
 +#OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_filmdint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fixpts.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_framestep.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fspp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_geq.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_harddup.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_hqdn3d.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_hue.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_il.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ilpack.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ivtc.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_kerndeint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_mcdeint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_mirror.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_noise.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ow.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_palette.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_perspective.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_phase.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pp7.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pullup.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_rectangle.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_remove_logo.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_rotate.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_sab.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_screenshot.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_smartblur.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softskip.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_stereo3d.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_swapuv.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tile.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_unsharp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yuvcsp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
 +
 +
  -include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
  
 -DIRS = x86
 +DIRS = x86 libmpcodecs
 +
 +TESTPROGS = formats
  
  TOOLS = graph2dot lavfi-showfiltfmts
- include $(SRC_PATH)/subdir.mak
@@@ -210,8 -212,8 +210,8 @@@ static void return_frame(AVFilterContex
  
      if (!yadif->csp)
          yadif->csp = &av_pix_fmt_descriptors[link->format];
-     if (yadif->csp->comp[0].depth_minus1 == 15)
+     if (yadif->csp->comp[0].depth_minus1 / 8 == 1)
 -        yadif->filter_line = filter_line_c_16bit;
 +        yadif->filter_line = (void*)filter_line_c_16bit;
  
      filter(ctx, yadif->out, tff ^ !is_second, tff);
  
@@@ -366,8 -344,8 +366,6 @@@ OBJS-$(CONFIG_TCP_PROTOCOL
  OBJS-$(CONFIG_TLS_PROTOCOL)              += tls.o
  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
  
 -EXAMPLES  = metadata output
 +
  TESTPROGS = seek
  TOOLS     = pktdumper probetest
--
- include $(SRC_PATH)/subdir.mak
 -$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
Simple merge
Simple merge
Simple merge
index cc3038f,0000000..6393598
mode 100644,000000..100644
--- /dev/null
@@@ -1,12 -1,0 +1,10 @@@
- include $(SRC_PATH)/subdir.mak
 +include $(SUBDIR)../config.mak
 +
 +NAME = swresample
 +FFLIBS = avutil
 +
 +HEADERS = swresample.h
 +
 +OBJS = swresample.o audioconvert.o resample.o rematrix.o
 +
 +TESTPROGS = swresample_test
Simple merge
  0, 472500, 84480, 0x13962590
  0, 476250, 84480, 0xde79482f
  0, 480000, 84480, 0x7d1ca064
- 0, 483750, 84480, 0x7e1de54e
 -0, 483750, 84480, 0x2676a064
++0, 483750, 84480, 0x0998a064