Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[ffmpeg] / libavformat / rtp.h

diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index 5cd77fed9b2df40883ffe523263a377bd427f251..fa3e1fa1bd70ad0d9570383b6833e074a8abd997 100644 (file)
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -63,10 +63,10 @@ const char *ff_rtp_enc_name(int payload_type);
  *
  * @param buf A pointer to the string containing the encoding name
  * @param codec_type The codec type
- * @return In case of unknown encoding name, CODEC_ID_NONE is returned;
+ * @return In case of unknown encoding name, AV_CODEC_ID_NONE is returned;
  * otherwise, the codec id is returned
  */
-enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);
+enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);
 
 #define RTP_PT_PRIVATE 96
 #define RTP_VERSION 2
@@ -77,7 +77,7 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);
 #define RTCP_TX_RATIO_DEN 1000
 
 /* An arbitrary id value for RTP Xiph streams - only relevant to indicate
- * the the configuration has changed within a stream (by changing the
+ * that the configuration has changed within a stream (by changing the
  * ident value sent).
  */
 #define RTP_XIPH_IDENT 0xfecdba