ffmpeg/libavcodec
Michael Niedermayer f9ecb849ef Merge remote-tracking branch 'qatar/master'
* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 04:47:19 +02:00
..
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-06-02 20:06:00 +01:00
2011-05-16 05:01:40 +02:00
2011-05-25 09:49:18 +02:00
2011-04-28 04:26:01 +02:00
2011-04-24 03:41:22 +02:00
2011-04-17 23:43:54 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-21 02:31:27 +02:00
2011-04-27 03:51:04 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-06-02 20:06:00 +01:00
2011-04-26 22:06:13 +02:00
2011-04-26 22:06:13 +02:00
2011-05-02 02:58:09 +02:00
2011-05-15 13:12:47 +02:00
2011-05-01 19:35:55 +02:00
2011-05-11 05:47:02 +02:00
2011-05-24 19:10:28 +02:00
2011-04-02 01:54:27 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-26 01:55:12 +02:00
2011-04-29 18:31:17 +02:00
2011-04-25 00:20:03 +02:00
2011-04-25 00:20:03 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-04-27 03:51:04 +02:00
2011-05-25 11:29:47 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-06-07 18:22:53 +02:00
2011-06-08 02:07:36 +02:00
2011-05-13 04:40:40 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-04-26 18:25:24 +02:00
2011-05-21 13:48:10 +02:00
2011-04-20 04:48:23 +02:00
2011-05-08 01:33:40 +02:00
2011-05-09 04:50:56 +02:00
2011-05-09 04:50:56 +02:00
2011-05-11 05:47:02 +02:00
2011-05-25 00:13:09 +02:00
2011-04-03 16:40:12 +02:00
2011-06-02 20:06:00 +01:00
2011-03-28 00:16:44 +02:00
2011-04-24 03:41:22 +02:00
2011-05-08 19:53:39 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-06-02 20:06:00 +01:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-04-27 03:51:04 +02:00
2011-05-22 02:33:03 +02:00
2011-05-07 04:14:09 +02:00
2011-04-20 04:48:23 +02:00
2011-06-02 20:06:00 +01:00