Merge commit 'f66d0c57'
* commit 'f66d0c57': latm: Add a probe function Conflicts: libavformat/rawdec.c See: 47818b2a See: 097f6680Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit 'f66d0c57': latm: Add a probe function Conflicts: libavformat/rawdec.c See: 47818b2a See: 097f6680Merged-by:Michael Niedermayer <michaelni@gmx.at>