Changeset 7c29313b in ffmpeg

Timestamp:

Dec 19, 2011, 1:34:18 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

29179239

Parents:

f371396d (diff), 2a216ca2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/19/11 01:11:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/19/11 01:34:18)

Message:

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>

(No files)