1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
FFmpeg/libavformat
Michael Niedermayer 7c29313b38 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  APIchanges: fill in revision for AVFrame.age deprecation
  avcodec: deprecate AVFrame.age
  4xm: remove unneeded check for remaining unused data.
  lavf: force threads to 1 in avformat_find_stream_info()
  swscale: fix overflows in vertical scaling at top/bottom edges.
  lavf: add OpenMG audio muxer.
  omadec: split data that will be used in the muxer to a separate file.
  lavf: rename oma.c -> omadec.c
  tmv decoder: set correct pix_fmt

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/oma.c
	libavformat/version.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-19 02:34:18 +01:00
..
2011-11-30 20:34:45 +01:00
2011-12-12 20:21:47 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-16 05:59:43 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-11-30 20:34:45 +01:00
2011-12-04 16:44:20 +01:00
2011-11-03 20:21:01 +01:00
2011-12-14 03:38:57 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-12-18 21:47:03 +01:00
2011-12-16 03:50:19 +01:00
2011-08-09 19:56:25 +02:00
2011-12-13 23:07:40 +01:00
2011-12-18 16:23:16 +01:00
2011-12-10 22:02:44 +01:00
2011-10-13 16:50:20 +02:00
2011-12-17 03:25:46 +01:00
2011-12-18 23:54:56 +01:00
2011-12-01 15:32:20 +00:00
2011-11-30 17:39:32 +02:00
2011-10-17 16:51:48 +02:00
2011-12-18 22:46:29 +01:00
2011-12-16 06:02:14 +01:00