aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-07 20:41:38 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-07 20:41:38 +0200
commit50462e3e5e3229ca76336b9f607d1b48134ae8d8 (patch)
treedb198009c12d8c560f14425bf5d0096a21330f67 /libavformat
parent123f6dc6b56392cdc8ec648da52c64c94ea0ff0c (diff)
downloadffmpeg-50462e3e5e3229ca76336b9f607d1b48134ae8d8.tar.gz
lavf/sdp: Fix MIME-type for big-endian G.726.
RFC 3551 defines "G726" for little-endian ("right-justified") G.726 and announces "AAL2-G726" for big-endian ("left-justified") G.726.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/sdp.c2
-rw-r--r--libavformat/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 66e9dffbf0..1f1c28e378 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -674,7 +674,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVStream *st, int
break;
case AV_CODEC_ID_ADPCM_G726: {
if (payload_type >= RTP_PT_PRIVATE)
- av_strlcatf(buff, size, "a=rtpmap:%d G726-%d/%d\r\n",
+ av_strlcatf(buff, size, "a=rtpmap:%d AAL2-G726-%d/%d\r\n",
payload_type,
p->bits_per_coded_sample*8,
p->sample_rate);
diff --git a/libavformat/version.h b/libavformat/version.h
index ac6edf7ea9..b5ad2101e0 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 82
-#define LIBAVFORMAT_VERSION_MICRO 102
+#define LIBAVFORMAT_VERSION_MICRO 103
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \