1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavfilter
Michael Niedermayer 7432bcfe5a 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>
2012-04-14 22:37:43 +02:00
..
2011-12-27 15:21:08 +01:00
2011-12-04 21:13:22 +01:00
2012-03-31 08:48:23 +02:00
2012-03-17 11:21:49 +01:00
2012-03-21 13:39:28 +01:00
2012-04-13 00:14:06 +02:00
2012-03-18 21:19:09 +01:00
2011-12-13 21:08:43 +01:00
2012-04-04 16:16:10 +02:00
2012-03-17 11:21:49 +01:00
2012-03-04 12:31:06 +01:00
2012-02-29 02:33:32 +01:00
2012-04-10 15:16:47 +02:00
2012-04-12 02:02:30 +02:00
2012-04-13 00:14:06 +02:00
2012-04-09 17:21:35 +02:00
2012-02-06 20:46:58 +01:00
2012-03-10 00:10:37 +01:00
2012-03-21 15:52:45 +01:00
2011-12-11 11:55:33 +01:00
2012-03-03 12:33:54 +01:00