Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Apr 2011 23:09:43 +0000 (01:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Apr 2011 23:09:43 +0000 (01:09 +0200)
commite16665bf72d226b2c87c76a677414b8ef7720d7e
treeb68414614d4ce2eecee89185f80a30a039899bb2
parent03ac7991286c583c73c8c44c71aeba1265c61cba
parentd9dee728b8c50fb6dbff3701e1abcb2eac5895b3
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>
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/avcodec.h
libavcodec/cook.c
libavcodec/loco.c
libavcodec/utils.c
libavcodec/vqavideo.c
libavcodec/wnv1.c
libavformat/oma.c