« Previous | Next » 

Revision 0fecf264

ID0fecf2642b9d909820683647c70031a954f5e58d
Parent e309fdc7, f1f60f52
Child a6be21d3

Added by Michael Niedermayer over 9 years ago

Merge remote-tracking branch 'newdev/master'

Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted