Merge commit '4438d1c6ede3190d7920513272fb9dc5371648f2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 23:33:36 +0000 (00:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 23:36:53 +0000 (00:36 +0100)
commit285eea00013f774cc935137a2e73a8f6ffb4e236
tree9ab0bdf3a4500b002be619c35e76e8d2d2052ede
parent1fa2d95f6beb31ee8e579a85d09daf84e2de3285
parent4438d1c6ede3190d7920513272fb9dc5371648f2
Merge commit '4438d1c6ede3190d7920513272fb9dc5371648f2'

* commit '4438d1c6ede3190d7920513272fb9dc5371648f2':
  rtsp: parse lang attribute in SDP

Conflicts:
libavformat/rtsp.h
libavformat/version.h

See: c7ad1f562b0fe46b77a8a9987a0d3512fc8197ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/version.h