ffmpeg/libavcodec
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
..
2012-03-20 18:46:56 -04:00
2012-03-27 11:58:15 -04:00
2012-02-20 15:08:41 -05:00
2012-04-06 08:32:09 +02:00
2012-01-14 04:47:27 +01:00
2012-03-21 03:03:33 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2012-04-01 16:11:29 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2011-12-10 11:58:03 +01:00
2012-03-13 01:14:04 +01:00
2012-04-06 22:37:38 +03:00
2012-04-09 20:55:09 +02:00
2012-03-02 18:58:19 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2012-03-26 22:22:51 +02:00
2012-04-14 20:04:51 +02:00
2012-03-30 20:10:39 +02:00
2012-02-14 01:22:38 +01:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-01-07 00:11:43 +01:00
2011-12-17 05:04:56 +01:00
2012-03-24 14:54:12 +01:00
2012-04-12 11:36:17 +02:00
2012-04-06 22:37:38 +03:00
2012-03-19 18:46:34 +01:00
2012-04-06 00:53:09 +02:00
2011-12-13 21:08:43 +01:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-03-24 17:48:03 +01:00
2011-10-19 20:26:55 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-01-08 20:22:12 +01:00
2012-04-10 23:37:30 +02:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-03-27 20:08:41 +02:00
2012-01-23 19:04:35 +01:00
2012-03-18 07:45:41 -07:00