[FFmpeg-cvslog] Merge commit '4438d1c6ede3190d7920513272fb9dc5371648f2'
Michael Niedermayer
git at videolan.org
Sun Feb 22 00:43:44 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 22 00:33:36 2015 +0100| [285eea00013f774cc935137a2e73a8f6ffb4e236] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=285eea00013f774cc935137a2e73a8f6ffb4e236
---
More information about the ffmpeg-cvslog
mailing list