Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Aug 2013 08:13:56 +0000 (10:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Aug 2013 08:13:56 +0000 (10:13 +0200)
commitc103d5f538d9eadab00f7de756bfc40ba0d2bcc5
tree9e656c521d97517f65c07cffc552525ed69ba6e3
parentf18ccb529fb7231f9d40814fbf843d10d9434b43
parent3ca5df36a50e3ffd3b24734725bf545617a627a8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wmalosslessdec.c