Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'

* commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits)
  ac3enc: merge AC3MDCTContext with AC3EncodeContext.
  ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
  ac3enc: fix memleak
  mpeg1video: add CODEC_CAP_SLICE_THREADS.
  lavf: fix segfault in av_open_input_stream()
  mpegtsenc: set Random Access indicator on keyframe start packets
  lavf: Cleanup try_decode_frame() logic.
  Replace some gotos that lead to single return statements by direct return.
  build: move tests/seek_test.c to libavformat and reuse generic build rules
  mxfenc: include needed header for ff_iso8601_to_unix_time() prototype
  Add a check for strptime().
  lavf: factor out conversion of ISO8601 string to unix time
  wav: parse 'bext' metadata
  wav: keep parsing until EOF if the input is seekable and we know the size of the data tag
  wav: Refactor the tag checking into a switch statement
  wav: make sure neither data_size nor sample_count is negative.
  wav: refactor the 'fmt ' tag search and parsing.
  wav: add an option for writing BEXT chunk
  ffmpeg: get rid of a pointless limit on number of streams.
  ffmpeg: remove an unused define.
  ...

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

diff --cc .gitignore
Simple merge

diff --cc Changelog
index f1d5654,782d8b3..470b302
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -1,16 -1,37 +1,17 @@@
  Entries are sorted chronologically from oldest to youngest within each release,
  releases are sorted from youngest to oldest.
  
 +version next:
  
 -version <next>:
 +- openal input device added
 +- boxblur filter added
+ - BWF muxer
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 +version 0.8:
  
  
 -version 0.7_beta2:
 -
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
 -
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support

diff --cc configure
index ee8180f,596b603..c658ef0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2812,8 -2776,8 +2813,9 @@@ check_func  mma
  check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
  check_func  setrlimit
  check_func  strerror_r
+ check_func  strptime
  check_func  strtok_r
 +check_func_headers conio.h kbhit
  check_func_headers io.h setmode
  check_func_headers lzo/lzo1x.h lzo1x_999_compress
  check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi

diff --cc doc/general.texi
Simple merge

diff --cc ffmpeg.c
index c4729df,ccf9c62..6196a5a
--- 1/ffmpeg.c
--- 2/ffmpeg.c
+++ b/ffmpeg.c
@@@ -114,8 -102,7 +114,7 @@@ typedef struct ChapterMap 
  static const OptionDef options[];
  
  #define MAX_FILES 100
 -
 +#define MAX_STREAMS 1024    /* arbitrary sanity check value */
- 
  static const char *last_asked_format = NULL;
  static double *ts_scale;
  static int  nb_ts_scale;

diff --cc ffplay.c
index b11642a,bbbf5c6..afafd41
--- 1/ffplay.c
--- 2/ffplay.c
+++ b/ffplay.c
@@@ -1690,14 -1709,14 +1690,14 @@@ static int configure_video_filters(AVFi
  
      if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
                                              NULL, is, graph)) < 0)
-         goto the_end;
+         return ret;
 -    if ((ret = avfilter_graph_create_filter(&filt_out, &ffsink, "out",
 -                                            NULL, &ffsink_ctx, graph)) < 0)
 +    if ((ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                            NULL, pix_fmts, graph)) < 0)
-         goto the_end;
+         return ret;
  
      if(vfilters) {
 -        AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut));
 -        AVFilterInOut *inputs  = av_malloc(sizeof(AVFilterInOut));
 +        AVFilterInOut *outputs = avfilter_inout_alloc();
 +        AVFilterInOut *inputs  = avfilter_inout_alloc();
  
          outputs->name    = av_strdup("in");
          outputs->filter_ctx = filt_src;
@@@ -1709,8 -1728,8 +1709,8 @@@
          inputs->pad_idx = 0;
          inputs->next    = NULL;
  
 -        if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0)
 +        if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0)
-             goto the_end;
+             return ret;
          av_freep(&vfilters);
      } else {
          if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0)

diff --cc ffserver.c
Simple merge

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc.h
index be2767a,6caf4d8..e3b4ba3
--- 1/libavcodec/ac3enc.h
--- 2/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@@ -66,11 -66,6 +66,7 @@@ typedef int64_t CoefSumType
  #endif
  
  
- typedef struct AC3MDCTContext {
-     const SampleType *window;           ///< MDCT window function
-     FFTContext fft;                     ///< FFT context for MDCT calculation
- } AC3MDCTContext;
 +#if 0
  /**
   * Encoding Options used by AVOption.
   */

diff --cc libavcodec/ac3enc_fixed.c
Simple merge

diff --cc libavcodec/ac3enc_float.c
Simple merge

diff --cc libavcodec/mpeg12.c
Simple merge

diff --cc libavformat/Makefile
index ce4891b,917b38a..9f5bfb4
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -338,10 -331,10 +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
  
- TESTPROGS = timefilter
 -EXAMPLES  = metadata output
+ TESTPROGS = seek timefilter
  TOOLS     = pktdumper probetest
  
  include $(SRC_PATH)/subdir.mak

diff --cc libavformat/dvenc.c
Simple merge

diff --cc libavformat/gxfenc.c
Simple merge

diff --cc libavformat/internal.h
Simple merge

diff --cc libavformat/movenc.c
Simple merge

diff --cc libavformat/mpc.c
Simple merge

diff --cc libavformat/mpegtsenc.c
Simple merge

diff --cc libavformat/mxfenc.c
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libavformat/wav.c
index f09e676,5b9f6e4..22419cc
--- 1/libavformat/wav.c
--- 2/libavformat/wav.c
+++ b/libavformat/wav.c
@@@ -336,7 -418,7 +418,8 @@@ static int wav_read_header(AVFormatCont
                     data_size, sample_count);
              return AVERROR_INVALIDDATA;
          }
 -        avio_skip(pb, size - 16); /* skip rest of ds64 chunk */
 +        avio_skip(pb, size - 24); /* skip rest of ds64 chunk */
++
      }
  
      for (;;) {

diff --cc tests/ref/lavf/ts
index efac3ad,325112c..3b2dad1
--- 1/tests/ref/lavf/ts
--- 2/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@@ -1,3 -1,3 +1,3 @@@
- 178f5094fc874112d21b4a8716121d96 *./tests/data/lavf/lavf.ts
 -9708011dd80212a0041a96da878122c2 *./tests/data/lavf/lavf.ts
++151774afed45b19da9b7e83613a1e72b *./tests/data/lavf/lavf.ts
  406644 ./tests/data/lavf/lavf.ts
  ./tests/data/lavf/lavf.ts CRC=0x133216c1