Merge commit '802713c4e7b41bc2deed754d78649945c3442063'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 09:57:06 +0000 (10:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 09:57:06 +0000 (10:57 +0100)
commitda501ea857b13ea13749e372ccca9ae0804ff4d5
tree1f43b7a2ba9a1ee63c1c38cc87983cbec20d8075
parent3a04c18d899d278eea551c216e5117974063062b
parent802713c4e7b41bc2deed754d78649945c3442063
Merge commit '802713c4e7b41bc2deed754d78649945c3442063'

* commit '802713c4e7b41bc2deed754d78649945c3442063':
  mss2: prevent potential uninitialized reads
  mss2: reindent after last commit
  mss2: fix handling of unmasked implicit WMV9 rectangles
  configure: add lavu dependency to lavr/lavfi .pc files
  x86inc: Set program_name outside of x86inc.asm

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/mss2.c
libavutil/x86/x86inc.asm
libavutil/x86/x86util.asm