Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 10:49:36 +0000 (12:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 10:49:36 +0000 (12:49 +0200)
* commit '05015d03da1d745bb92915b5cea92dec16af719f':
  matroska: fix a corner case in ebml-lace parsing
  avfiltergraph: check for sws opts being non-NULL before using them.
  configure: Enable hwaccels without external dependencies by default.
  oma: Validate sample rates

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/oma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/matroskadec.c
libavformat/oma.c
libavformat/omadec.c

diff --cc configure
+++ b/configure
@@@ -2100,9 -1845,12 +2100,12 @@@ enable safe_bitstream_reade
  enable static
  enable swscale_alpha
  
+ # By default, enable only those hwaccels that have no external dependencies.
+ enable dxva2 vdpau
  # build settings
  SHFLAGS='-shared -Wl,-soname,$$(@F)'
 -AVSERVERLDFLAGS=-Wl,-E
 +FFSERVERLDFLAGS=-Wl,-E
  LIBPREF="lib"
  LIBSUF=".a"
  FULLNAME='$(NAME)$(BUILDSUF)'
  #include <string.h>
  
  #include "libavutil/avassert.h"
+ #include "libavutil/avstring.h"
  #include "libavutil/channel_layout.h"
 -#include "libavutil/common.h"
 -#include "libavutil/log.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2()
  #include "avfilter.h"
  #include "avfiltergraph.h"
  #include "formats.h"
Simple merge
Simple merge
Simple merge
Simple merge