-
Mickaël Raulet authored
Conflicts: libavcodec/hevc.h libavcodec/hevc_filter.c libavcodec/hevc_refs.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
1c8de4dd
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_filter.c
libavcodec/hevc_refs.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>