1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavcodec
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-12-13 23:07:40 +01:00
2011-11-27 21:19:07 +01:00
2011-12-15 03:59:29 +01:00
2011-12-14 00:39:58 +01:00
2011-11-25 13:19:54 +00:00
2011-12-18 20:51:40 +01:00
2011-12-18 20:49:34 +01:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01:00
2011-12-15 19:23:07 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-14 18:14:20 +01:00
2011-11-05 00:02:31 +01:00
2011-12-11 00:32:25 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-11-09 23:10:07 +01:00
2011-12-11 00:32:25 +01:00
2011-12-03 03:00:49 +01:00
2011-12-03 03:00:44 +01:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-15 02:43:03 +01:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-12-18 01:20:18 +01:00
2011-11-24 15:39:41 +01:00
2011-12-15 18:38:04 +01:00
2011-12-17 05:04:56 +01:00
2011-12-18 03:35:46 +01:00
2011-12-13 15:46:23 +01:00
2011-12-05 03:22:06 +01:00
2011-11-11 18:40:19 +01:00
2011-12-18 02:09:17 +01:00
2011-12-13 21:08:43 +01:00
2011-11-12 20:15:21 +01:00
2011-12-13 20:01:49 +01:00
2011-11-12 20:15:56 +01:00
2011-12-13 21:08:43 +01:00
2011-12-02 03:23:07 +01:00
2011-12-13 19:54:31 +01:00
2011-12-14 03:38:57 +01:00
2011-12-01 18:46:22 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-12 20:49:53 +01:00