Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58' | Michael Niedermayer | 2014-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 decoder | Nidhi Makhijani | 2014-07-06 |
Signed-off-by: Diego Biurrun <diego@biurrun.de> |