Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 13:02:17 +0000 (15:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 13:02:17 +0000 (15:02 +0200)
commitb21b5b04cca0633bd88db972ff1187ab7825b667
treeb7e2b1d8d03dffdec3daa03cfcd46b4f3537a418
parent8510150f48ef3a2008f97af6c4618f150a60edd7
parent6980453569b09239d3fcc4cc7335956f36e484d4
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>
configure
doc/APIchanges
libavutil/opt.h
libavutil/version.h