Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:36:01 +0000 (09:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:36:34 +0000 (09:36 +0200)
commit73d5cf8f43786b3a643d9955e4c6499f5b391b81
tree8b6435ea549944a7863eda9629341a428a4ccb03
parent5d199c3ad985eab4500cbfd2d1146ac70197ceac
parent84d3ff50cd679e0f35f0b7ce2cb2cedd99169959
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
doc/encoders.texi
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libwavpackenc.c
libavcodec/version.h