Merge commit 'e5447826'
* commit 'e5447826': riff: Move guid structs and helper functions into riff Conflicts: libavformat/asf.h libavformat/riff.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment