Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jan 2013 11:30:32 +0000 (12:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jan 2013 11:30:32 +0000 (12:30 +0100)
commit8bfc8d88be9be07c53aa290515d022c9a938e18d
tree7baa8f8cf672b391fd7f4dd676f10900b6a47e29
parent3ac85bebd51c868e675c4c0d4361e400609e6f15
parentec86ba57312745fd7ad9771e3121e79c6aacba30
Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'

* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
  vp3: Fix double free in vp3_decode_end()
  fate: Split fate-siff test into demuxer and VB video decoder test

Conflicts:
tests/fate/demux.mak
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp3.c
tests/fate/demux.mak
tests/fate/video.mak