Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 01:10:05 +0000 (02:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 01:10:05 +0000 (02:10 +0100)
commitc849b00b804cc02b6d68e02d8f7814369118bb83
tree58028f9d5b4c7aa4ece411c6f977f059e4c587c9
parent6a24d77929e0d5425c79a081034719ac68199602
parent8370a6fa59429e420999a738bc6c0d5a6ac4003a
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavformat/mpegts.c

See: f9b997c337873dad99f7fd505588b260febaf32b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c