Merge commit 'c3311d47'
* commit 'c3311d47': avienc: sanitize variable naming in write_header() Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment