-
Michael Niedermayer authored
* commit '1ae7afd2': hevc: split out setting AVCodecContext parameters Conflicts: libavcodec/hevc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
a7a6194e
* commit '1ae7afd2': hevc: split out setting AVCodecContext parameters Conflicts: libavcodec/hevc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>