Michael Niedermayer c849b00b80 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  libavformat/mpegts: expose raw packet size

Conflicts:
	libavformat/mpegts.c

See: f9b997c337
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-02-20 02:10:05 +01:00

84 KiB

Raw Blame History

View Raw