« Previous | Next » 

Revision 4727ec3c

ID4727ec3c0e64b9144006abf82e080fb734ad4b0a
Parent 13d4ec84, db46be01
Child a299a261

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
    Fix compilation of timefilter test program.
    Add support for AMR-WB encoding via libvo-amrwbenc
    Add an AAC encoder by using the libvo-aacenc library
    g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
Changelog

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted