Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Jun 2013 08:12:46 +0000 (10:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Jun 2013 08:12:46 +0000 (10:12 +0200)
commita18bf95a8ec4cc2459aa3860e99f2945d7976835
treea0431098ef57b1f8e6f768bb4622695489a21bf8
parentf97e28ebe5233f6520b161ab8dbbe937dda46dc3
parent2681924b0f3f35840dd9d9825df9f9239c448b22
Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'

* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
  libavformat: Fix standalone compilation of the webm muxer

Conflicts:
libavformat/Makefile

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