Mercurial > libavformat.hg
diff rtp.c @ 1472:49d5a5ca2987 libavformat
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
| author | bcoudurier |
|---|---|
| date | Thu, 09 Nov 2006 11:37:30 +0000 |
| parents | 234a04b906f9 |
| children | 92afee454599 |
line wrap: on
line diff
--- a/rtp.c Thu Nov 09 00:09:27 2006 +0000 +++ b/rtp.c Thu Nov 09 11:37:30 2006 +0000 @@ -186,7 +186,7 @@ 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 @@ 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 @@ // 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; {
