diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
| commit | cbee7a69448467ca615a53fd3927b53b1547509d (patch) | |
| tree | fb82a9365866806832a994ff7932c8d9e06c8d2f /libavformat/rtp.c | |
| parent | 6c4d16556b96dae18977fddad3a43faaed579993 (diff) | |
| download | ffmpeg-cbee7a69448467ca615a53fd3927b53b1547509d.tar.gz | |
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtp.c')
| -rw-r--r-- | libavformat/rtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 7bef395f3a..37a2862892 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -186,7 +186,7 @@ AVRtpPayloadType_t AVRtpPayloadTypes[]= RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4}; -static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_MPEG4AAC}; +static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_AAC}; static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) { @@ -564,7 +564,7 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam pkt->pts = addend + delta_timestamp; } break; - case CODEC_ID_MPEG4AAC: + case CODEC_ID_AAC: case CODEC_ID_H264: case CODEC_ID_MPEG4: pkt->pts = timestamp; @@ -694,7 +694,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, // moved from below, verbatim. this is because this section handles packets, and the lower switch handles // timestamps. // TODO: Put this into a dynamic packet handler... - case CODEC_ID_MPEG4AAC: + case CODEC_ID_AAC: if (rtp_parse_mp4_au(s, buf)) return -1; { |