« Previous | Next » 

Revision e16665bf

IDe16665bf72d226b2c87c76a677414b8ef7720d7e
Parent 03ac7991, d9dee728
Child 4b5c2175

Added by Michael Niedermayer over 9 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted