aboutsummaryrefslogtreecommitdiff
path: root/libavformat/rtpdec_g726.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos2016-10-22 03:53:38 +0200
committerCarl Eugen Hoyos2016-10-22 03:53:38 +0200
commit6969bed12c6fc53509aa694aab32d01838318f30 (patch)
tree36a8108a777f6bff99f8cdca449abd3f4dd6f192 /libavformat/rtpdec_g726.c
parent41da4f8cb3a7ac6888dbe6a6bbe1a573a74062ff (diff)
lavf/rtpdec_g726: Map mime type G726 to g726le.
Add new mime types AAL2-G726 for g726 as suggested in rfc 3551. This patch will break interaction with applications that incorrectly use big-endian G.726 with mime type G726 but we know of at least one device (DVTel camera) that correctly implements the rfc, so do the same. Fixes ticket #5890.
Diffstat (limited to 'libavformat/rtpdec_g726.c')
-rw-r--r--libavformat/rtpdec_g726.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/rtpdec_g726.c b/libavformat/rtpdec_g726.c
index 172a4b36ab..2de09ac233 100644
--- a/libavformat/rtpdec_g726.c
+++ b/libavformat/rtpdec_g726.c
@@ -36,10 +36,16 @@ static av_cold int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, \
} \
\
RTPDynamicProtocolHandler ff_g726_ ## bitrate ## _dynamic_handler = { \
- .enc_name = "G726-" #bitrate, \
+ .enc_name = "AAL2-G726-" #bitrate, \
.codec_type = AVMEDIA_TYPE_AUDIO, \
.codec_id = AV_CODEC_ID_ADPCM_G726, \
.init = g726_ ## bitrate ## _init, \
+}; \
+RTPDynamicProtocolHandler ff_g726le_ ## bitrate ## _dynamic_handler = { \
+ .enc_name = "G726-" #bitrate, \
+ .codec_type = AVMEDIA_TYPE_AUDIO, \
+ .codec_id = AV_CODEC_ID_ADPCM_G726LE, \
+ .init = g726_ ## bitrate ## _init, \
}
RTP_G726_HANDLER(16);