Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 14:17:19 +0000 (15:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 14:17:29 +0000 (15:17 +0100)
commit5144d919964f050d953b9dbe6910fb5388a1965d
treed3b1572323ff2f1ddd452293620558106c08232b
parent40fc1e2dda7b7695702a0e8669aa9429f88b593b
parent7b03b65bf0d02519c86750d2da33f413e11cf0c6
Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'

* commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6':
  lavf: do basic sanity checking on muxed packets

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