-
Michael Niedermayer authored
* commit '03ca6d70': x264: Factor out the reconfiguration code Conflicts: libavcodec/libx264.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
4ed3a01d
* commit '03ca6d70': x264: Factor out the reconfiguration code Conflicts: libavcodec/libx264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>