Merge branch 'master' of git://git.ffmpeg.org/ffmpeg

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

diff --cc configure
index ca76a27,4d308d2..5760ea0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2835,11 -2851,10 +2868,11 @@@ check_mathfunc trunc
  # these are off by default, so fail if requested and not available
  enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
  enabled frei0r     && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; }
- enabled libdirac   && add_cflags $(pkg-config --cflags dirac) &&
-                       require  libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) &&
-                       require  libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
+ enabled libdirac   && require_pkg_config dirac                          \
+     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
+     "dirac_decoder_init dirac_encoder_init"
  enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 +enabled libfreetype && add_cflags $(pkg-config --cflags freetype2) && require libfreetype ft2build.h FT_Init_FreeType -lfreetype
  enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
  enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
  enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut

diff --cc ffmpeg.c
Simple merge

diff --cc libavcodec/Makefile
index 2a2197d,e116a7d..eefe60c
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -26,7 -26,7 +26,8 @@@ OBJS = allcodecs.
  
  # parts needed for many different codecs
  OBJS-$(CONFIG_AANDCT)                  += aandcttab.o
+ OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
 +OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
  OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
  OBJS-$(CONFIG_DCT)                     += dct.o
  OBJS-$(CONFIG_DWT)                     += dwt.o

diff --cc libavcodec/avcodec.h
Simple merge