1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavutil
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-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-04-29 20:01:04 +02:00
2011-05-14 02:19:58 +02:00
2011-06-02 21:03:54 +02:00
2011-06-02 21:03:54 +02:00
2011-06-08 07:43:45 +02:00
2011-06-08 07:43:45 +02:00
2011-05-30 03:11:54 +02:00
2011-05-09 21:23:45 +02:00
2011-06-04 17:03:25 +01:00
2011-04-22 03:54:30 +02:00
2011-05-09 04:50:56 +02:00
2011-06-08 07:43:45 +02:00
2011-04-27 03:51:04 +02:00
2011-05-12 20:07:39 +02:00
2011-04-21 03:37:05 +02:00
2011-04-27 03:51:04 +02:00