Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 21:43:37 +0000 (23:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 21:43:37 +0000 (23:43 +0200)
commit96761e9306a9f96abaaa6bf53fe48c4d6872f48e
tree77d77d8f3559331acbc73448960abf860d509575
parent8be23d424feea50d4ee892cdbdd6abd9a807709f
parent2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58
Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
libavcodec/bmvvideo.c

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