Merge commit 'e118bb1a'
* commit 'e118bb1a': mxf: Introduce ff_mxf_get_samples_per_frame Conflicts: libavformat/mxf.c libavformat/mxf.h See: 906a2638Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment