Michael Niedermayer b21b5b04cc Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  build: eamad: Add missing dependency on mpegvideo code
  build: utvideoenc: Add missing dependency on Huffman code
  avopt: Reorder the default_val struct, making i64 the first field

Conflicts:
	configure
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-09-05 15:02:17 +02:00

50 KiB

Raw Blame History

View Raw