-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a5eb70ad) Conflicts: libavformat/mpegts.c
df12a242
Signed-off-by:Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a5eb70ad) Conflicts: libavformat/mpegts.c