Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:31:22 +0000 (00:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:31:22 +0000 (00:31 +0200)
commit9e8c92226fe18a21b6605550a50b67066a6bffd9
tree5f834efd640c875558c4c30043a6020db624ffba
parent738272826f4b3b060dfe2855df5ce11865df1ec7
parent85d805d5cccb2f57e7f2e2254d7a870f05926cfd
Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'

* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd':
  build: Add missing object files for webm muxer

Conflicts:
libavformat/Makefile

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