Merge commit '66f09105'
* commit '66f09105': mpeg12enc: drop forward declarations Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment