diff options
| author | Michael Niedermayer <[email protected]> | 2015-02-22 00:33:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-02-22 00:36:53 +0100 |
| commit | 285eea00013f774cc935137a2e73a8f6ffb4e236 (patch) | |
| tree | 9ab0bdf3a4500b002be619c35e76e8d2d2052ede /libavcodec/mpegaudio_parser.c | |
| parent | 1fa2d95f6beb31ee8e579a85d09daf84e2de3285 (diff) | |
| parent | 4438d1c6ede3190d7920513272fb9dc5371648f2 (diff) | |
Merge commit '4438d1c6ede3190d7920513272fb9dc5371648f2'
* commit '4438d1c6ede3190d7920513272fb9dc5371648f2':
rtsp: parse lang attribute in SDP
Conflicts:
libavformat/rtsp.h
libavformat/version.h
See: c7ad1f562b0fe46b77a8a9987a0d3512fc8197ea
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/mpegaudio_parser.c')
0 files changed, 0 insertions, 0 deletions