Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 08:06:35 +0000 (10:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 08:07:30 +0000 (10:07 +0200)
commit53015bb3b340885d576af87afd20479ecb126bf4
tree3651920967aeb6783257c323d1b1366db346b35c
parentad649e829d6af3409ea1bb2d45cc4e1310f3ba69
parent794ca87d2bff2513118de8b97595b3e23070e67d
Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
  wvdec: split block header parsing into a separate file

Conflicts:
libavformat/Makefile
libavformat/wvdec.c

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