Changeset e16665bf in ffmpeg

Timestamp:

Apr 22, 2011, 11:09:43 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4b5c2175

Parents:

03ac7991 (diff), d9dee728 (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.

Message:

Merge remote branch 'qatar/master'

• qatar/master: Use av_log_ask_for_sample() to request samples from users. Make av_log_ask_for_sample() accept a variable number of arguments. vqavideo: We no longer need to ask for version 1 samples. aacdec: indentation cosmetics

Conflicts:

libavcodec/utils.c

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

(No files)