Merge commit 'f5f1cf52'
* commit 'f5f1cf52': oggdec: K&R cosmetic formatting hlsenc: correctly report target duration Conflicts: libavformat/oggdec.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment