Merge commit '34bbc81d'
* commit '34bbc81d': lavf: simplify ff_hevc_annexb2mp4_buf Conflicts: libavformat/hevc.c libavformat/hevc.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please register or sign in to comment
* commit '34bbc81d': lavf: simplify ff_hevc_annexb2mp4_buf Conflicts: libavformat/hevc.c libavformat/hevc.h Merged-by:Michael Niedermayer <michaelni@gmx.at>