Changeset 6716e689 in ffmpeg

Timestamp:

Mar 22, 2012, 7:59:58 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

abdcb491

Parents:

b1a0d694 (diff), e9c0b12c (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> (03/22/12 19:58:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/22/12 19:59:58)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: FATE: Add ZeroCodec test oggparseogm: fix order of arguments of avpriv_set_pts_info(). pngenc: better upper bound for encoded frame size. aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C aiffdec: do not set bit rate if block duration is unknown wmall: output packet only if we have decoded some samples

Conflicts:

libavcodec/pngenc.c
tests/fate/lossless-video.mak

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

(No files)