Merge commit '51fc88e7'
* commit '51fc88e7': avconv: improve some variable names Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '51fc88e7': avconv: improve some variable names Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>