aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-22 00:33:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-22 00:36:53 +0100
commit285eea00013f774cc935137a2e73a8f6ffb4e236 (patch)
tree9ab0bdf3a4500b002be619c35e76e8d2d2052ede /Changelog
parent1fa2d95f6beb31ee8e579a85d09daf84e2de3285 (diff)
parent4438d1c6ede3190d7920513272fb9dc5371648f2 (diff)
downloadffmpeg-285eea00013f774cc935137a2e73a8f6ffb4e236.tar.gz
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>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions