Michael Niedermayer e16665bf72 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>

2011-04-23 01:09:43 +02:00

6.6 KiB

Raw Blame History

View Raw