Merge commit 'c8f3cb91'
* commit 'c8f3cb91': vmd: return meaningful errors Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'c8f3cb91': vmd: return meaningful errors Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>