Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 20:34:38 +0000 (21:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 20:43:13 +0000 (21:43 +0100)
commitc6792275f43cdf1fc42f1cf4bd37c4595b048180
tree3dc45f7370a2323b163d46f5c5c0ea98aca96bdb
parentc23a0e77dd492d6c794f89dbff3a438c95745e70
parent26524e358147aade6e9dd18fff42d61b966bbc70
Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'

* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
  rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

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