aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_mpeg4.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-04-20 15:36:37 +0300
committerMartin Storsjö <martin@martin.st>2011-04-24 00:05:37 +0300
commit9261e6cf3fe579fa02a96761c8e81a77bb3d8b2e (patch)
tree35cadce6dbfeee1112fd60a2ed9c53456c4bfff0 /libavformat/rtpdec_mpeg4.c
parent89b503b55f2b2713f1c3cc8981102c1a7b663281 (diff)
downloadffmpeg-9261e6cf3fe579fa02a96761c8e81a77bb3d8b2e.tar.gz
rtp: Rename the open/close functions to alloc/free
This avoids clashes if we internally want to override the global open function. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
-rw-r--r--libavformat/rtpdec_mpeg4.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index 9f2fcb3dbc..7a63cc315b 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -235,8 +235,8 @@ RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = CODEC_ID_MPEG4,
.parse_sdp_a_line = parse_sdp_line,
- .open = NULL,
- .close = NULL,
+ .alloc = NULL,
+ .free = NULL,
.parse_packet = NULL
};
@@ -245,7 +245,7 @@ RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_AAC,
.parse_sdp_a_line = parse_sdp_line,
- .open = new_context,
- .close = free_context,
+ .alloc = new_context,
+ .free = free_context,
.parse_packet = aac_parse_packet
};