Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Apr 2012 19:49:01 +0000 (21:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Apr 2012 20:37:43 +0000 (22:37 +0200)
commit7432bcfe5a36331502c49fe03aefe39b9936247a
tree398b1874abbd4bcf7c103738ac4548e830af0a43
parent01bf2ad7351fdaa2e21b6bdf963d22d6ffccb920
parent7bf9e3391fa21d90ff283fc03a12287fe73db9e8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vsrc_buffer: fix check from 7ae7c41.
  libxvid: Reorder functions to avoid forward declarations; make functions static.
  libxvid: drop some pointless dead code
  wmal: vertical alignment cosmetics
  wmal: Warn about missing bitstream splicing feature and ask for sample.
  wmal: Skip seekable_frame_in_packet.
  wmal: Drop unused variable num_possible_block_size.
  avfiltergraph: make the AVFilterInOut alloc/free API public
  graphparser: allow specifying sws flags in the graph description.
  graphparser: fix the order of connecting unlabeled links.
  graphparser: add avfilter_graph_parse2().
  vsrc_buffer: allow using a NULL buffer to signal EOF.
  swscale: handle last pixel if lines have an odd width.
  qdm2: fix a dubious pointer cast
  WMAL: Do not try to read rawpcm coefficients if bits is invalid
  mov: Fix detecting there is no sync sample.
  tiffdec: K&R cosmetics
  avf: has_duration does not check the global one
  dsputil: fix optimized emu_edge function on Win64.

Conflicts:
doc/APIchanges
libavcodec/libxvid_rc.c
libavcodec/libxvidff.c
libavcodec/tiff.c
libavcodec/wmalosslessdec.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/vsrc_buffer.c
libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
doc/APIchanges
doc/filters.texi
libavcodec/libxvid_rc.c
libavcodec/libxvidff.c
libavcodec/qdm2.c
libavcodec/tiff.c
libavcodec/wmalosslessdec.c
libavcodec/x86/dsputil_yasm.asm
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/vsrc_buffer.c
libavformat/isom.h
libavformat/mov.c
libavformat/utils.c
libswscale/output.c
tests/lavfi-regression.sh