* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b': lavf: simplify ff_hevc_annexb2mp4_buf Conflicts: libavformat/hevc.c libavformat/hevc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
4.1 KiB
4.1 KiB