summaryrefslogtreecommitdiff
path: root/libavcodec/bmvaudio.c
Commit message (Collapse)AuthorAge
* Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'Michael Niedermayer2014-07-06
| | | | | | | | | | * commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58': bmv: Split audio and video decoder Conflicts: libavcodec/bmvvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* bmv: Split audio and video decoderNidhi Makhijani2014-07-06
Signed-off-by: Diego Biurrun <diego@biurrun.de>