Changeset be2e211d in ffmpeg

Timestamp:

Feb 20, 2012, 12:29:30 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6e6bdeb1

Parents:

f4f386dd (diff), 6b8b0fe2 (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> (02/19/12 23:47:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/20/12 00:29:30)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: doxy: remove reference to removed api examples: unbreak compilation ttadec: cosmetics: reindent sunrast: use RLE trigger macro inplace of the hard coded value. sunrastenc: set keyframe flag for the output packet. mpegvideo_enc: switch to encode2(). mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0

Conflicts:

doc/examples/muxing.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)