Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
	Makefile
	libavcodec/utils.c
	libavformat/avformat.h
	libswscale/swscale_internal.h

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

diff --cc Makefile
index 5bc9c25,720936a..8eb4ab6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -47,10 -88,11 +49,15 @@@ FF_DEP_LIBS  := $(DEP_LIBS
  
  all: $(FF_DEP_LIBS) $(PROGS)
  
 +$(PROGS): %$(EXESUF): %_g$(EXESUF)
 +      $(CP) $< $@
 +      $(STRIP) $@
 +
+ $(TOOLS): %$(EXESUF): %.o
+       $(LD) $(LDFLAGS) -o $@ $< $(ELIBS)
+ 
+ tools/cws2fws$(EXESUF): ELIBS = -lz
+ 
  config.h: .config
  .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
        @-tput bold 2>/dev/null
@@@ -75,24 -117,12 +82,12 @@@ ende
  $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
  
  ffplay.o: CFLAGS += $(SDL_CFLAGS)
 -ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 -ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
 +ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
 +ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
  
 -$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
 +%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
  
- TOOLS     = cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher
- TOOLOBJS := $(TOOLS:%=tools/%.o)
- TOOLS    := $(TOOLS:%=tools/%$(EXESUF))
- 
- alltools: $(TOOLS)
- 
- tools/%$(EXESUF): tools/%.o
-       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
- 
- $(TOOLOBJS): %.o: %.c | tools
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<
- 
  OBJDIRS += tools
  
  -include $(wildcard tools/*.d)

diff --cc cmdutils.c
Simple merge

diff --cc common.mak
Simple merge

diff --cc configure
Simple merge

diff --cc doc/examples/encoding.c
Simple merge

diff --cc ffprobe.c
Simple merge

diff --cc ffserver.c
Simple merge

diff --cc libavcodec/ac3dec.c
Simple merge

diff --cc libavcodec/ac3dec.h
index 4b3e7e3,a7cebaf..8e84c18
--- 1/libavcodec/ac3dec.h
--- 2/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@@ -62,12 -62,11 +62,13 @@@
  
  #define SPX_MAX_BANDS    17
  
 +/** Large enough for maximum possible frame size when the specification limit is ignored */
 +#define AC3_FRAME_BUFFER_SIZE 32768
 +
  typedef struct {
+     AVClass        *class;                  ///< class for AVOptions
      AVCodecContext *avctx;                  ///< parent context
      GetBitContext gbc;                      ///< bitstream reader
 -    uint8_t *input_buffer;                  ///< temp buffer to prevent overread
  
  ///@name Bit stream information
  ///@{

diff --cc libavcodec/arm/fft_neon.S
Simple merge

diff --cc libavcodec/arm/h264idct_neon.S
Simple merge

diff --cc libavcodec/arm/h264pred_neon.S
Simple merge

diff --cc libavcodec/arm/simple_idct_neon.S
Simple merge

diff --cc libavcodec/arm/vp3dsp_neon.S
Simple merge

diff --cc libavcodec/arm/vp8_armv6.S
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/internal.h
Simple merge

diff --cc libavcodec/motion-test.c
Simple merge

diff --cc libavcodec/mpegvideo_enc.c
Simple merge

diff --cc libavcodec/options.c
Simple merge

diff --cc libavcodec/utils.c
index 0c84965,5ad0c51..356e21f
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -479,15 -468,20 +480,26 @@@ AVFrame *avcodec_alloc_frame(void)
      return pic;
  }
  
 +static void avcodec_get_subtitle_defaults(AVSubtitle *sub)
 +{
 +    memset(sub, 0, sizeof(*sub));
 +    sub->pts = AV_NOPTS_VALUE;
 +}
 +
+ #if FF_API_AVCODEC_OPEN
  int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
  {
+     return avcodec_open2(avctx, codec, NULL);
+ }
+ #endif
+ 
+ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
+ {
      int ret = 0;
+     AVDictionary *tmp = NULL;
+ 
+     if (options)
+         av_dict_copy(&tmp, *options, 0);
  
      /* If there is a user-supplied mutex locking routine, call it. */
      if (ff_lockmgr_cb) {

diff --cc libavcodec/version.h
Simple merge

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavfilter/Makefile
index 3755630,1a6fd9b..a8233fd
--- 1/libavfilter/Makefile
--- 2/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@@ -68,77 -55,13 +68,79 @@@ OBJS-$(CONFIG_COLOR_FILTER
  OBJS-$(CONFIG_FREI0R_SRC_FILTER)             += vf_frei0r.o
  OBJS-$(CONFIG_MOVIE_FILTER)                  += vsrc_movie.o
  OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o
 +OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o
  
 +OBJS-$(CONFIG_BUFFERSINK_FILTER)             += vsink_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_blackframe.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_boxblur.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_cropdetect.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_decimate.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_delogo.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_gradfun.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_rgbtest.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_swapuv.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_test.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
  
+ TOOLS = graph2dot lavfi-showfiltfmts
+ 
  include $(SRC_PATH)/subdir.mak

diff --cc libavfilter/vsrc_movie.c
Simple merge

diff --cc libavformat/Makefile
index 6d7a342,ca337e0..ce4891b
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -338,9 -331,12 +338,10 @@@ OBJS-$(CONFIG_TCP_PROTOCOL
  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
  
  # libavdevice dependencies
 +OBJS-$(CONFIG_ALSA_INDEV)                += timefilter.o
  OBJS-$(CONFIG_JACK_INDEV)                += timefilter.o
  
 -EXAMPLES  = metadata output
  TESTPROGS = timefilter
+ TOOLS     = pktdumper probetest
  
  include $(SRC_PATH)/subdir.mak
 -
 -$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale

diff --cc libavformat/avformat.h
index 3d57fa9,6e861de..a0c2047
--- 1/libavformat/avformat.h
--- 2/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@@ -1138,35 -1093,7 +1138,36 @@@ int av_demuxer_open(AVFormatContext *ic
   */
  AVFormatContext *avformat_alloc_context(void);
  
 +#if FF_API_ALLOC_OUTPUT_CONTEXT
 +/**
 + * @deprecated deprecated in favor of avformat_alloc_output_context2()
 + */
 +attribute_deprecated
 +AVFormatContext *avformat_alloc_output_context(const char *format,
 +                                               AVOutputFormat *oformat,
 +                                               const char *filename);
 +#endif
 +
 +/**
 + * Allocate an AVFormatContext for an output format.
 + * avformat_free_context() can be used to free the context and
 + * everything allocated by the framework within it.
 + *
 + * @param *ctx is set to the created format context, or to NULL in
 + * case of failure
 + * @param oformat format to use for allocating the context, if NULL
 + * format_name and filename are used instead
 + * @param format_name the name of output format to use for allocating the
 + * context, if NULL filename is used instead
 + * @param filename the name of the filename to use for allocating the
 + * context, may be NULL
 + * @return >= 0 in case of success, a negative AVERROR code in case of
 + * failure
 + */
 +int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oformat,
 +                                   const char *format_name, const char *filename);
 +
+ #if FF_API_FORMAT_PARAMETERS
  /**
   * Read packets of a media file to get stream information. This
   * is useful for file formats with no headers such as MPEG. This

diff --cc libavformat/matroskadec.c
Simple merge

diff --cc libavformat/movenc.c
Simple merge

diff --cc libavformat/movenchint.c
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libswscale/swscale_internal.h
index 2ffd44d,9492303..30dec99
--- 1/libswscale/swscale_internal.h
--- 2/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@@ -347,10 -345,13 +347,13 @@@ typedef struct SwsContext 
      DECLARE_ALIGNED(8, uint64_t, v_temp);
      DECLARE_ALIGNED(8, uint64_t, y_temp);
      int32_t  alpMmxFilter[4*MAX_FILTER_SIZE];
 -    DECLARE_ALIGNED(8, ptrdiff_t, uv_off_px);   ///< offset (in pixels) between u and v planes
 -    DECLARE_ALIGNED(8, ptrdiff_t, uv_off_byte); ///< offset (in bytes) between u and v planes
+     // alignment of these values is not necessary, but merely here
+     // to maintain the same offset across x8632 and x86-64. Once we
+     // use proper offset macros in the asm, they can be removed.
-     uint16_t dither16[8];
-     uint32_t dither32[8];
 +    DECLARE_ALIGNED(8, ptrdiff_t, uv_off); ///< offset (in pixels) between u and v planes
 +    DECLARE_ALIGNED(8, ptrdiff_t, uv_offx2); ///< offset (in bytes) between u and v planes
+     DECLARE_ALIGNED(8, uint16_t, dither16)[8];
+     DECLARE_ALIGNED(8, uint32_t, dither32)[8];
  
      const uint8_t *chrDither8, *lumDither8;
  

diff --cc subdir.mak
Simple merge