-
Michael Niedermayer authored
* commit '3567b91e': rtpdec_hevc: Share the implementation of fragmented packets with h264 Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
17773f49
* commit '3567b91e': rtpdec_hevc: Share the implementation of fragmented packets with h264 Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>