Merge commit '1ae7afd2'
* commit '1ae7afd2': hevc: split out setting AVCodecContext parameters Conflicts: libavcodec/hevc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '1ae7afd2': hevc: split out setting AVCodecContext parameters Conflicts: libavcodec/hevc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>