rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

[ffmpeg] / libavformat / mov_chan.h

diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h
index abb6916144ac5fc4a4119bbadf19d750f9db095d..3fae93961ea3ea4101c6e0796dadc8a6a61b4800 100644 (file)
--- a/libavformat/mov_chan.h
+++ b/libavformat/mov_chan.h
@@ -29,6 +29,7 @@
 #include <stdint.h>
 
 #include "libavcodec/avcodec.h"
+#include "avformat.h"
 
 /**
  * Get the channel layout for the specified channel layout tag.
@@ -39,14 +40,6 @@
  */
 uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap);
 
-/**
- * Get the channel layout for the specified channel layout tag.
- *
- * @param[in]  tag     channel label
- * @return             channel layout mask fragment
- */
-uint32_t ff_mov_get_channel_label(uint32_t label);
-
 /**
  * Get the channel layout tag for the specified codec id and channel layout.
  * If the layout tag was not found, use a channel bitmap if possible.
@@ -56,8 +49,20 @@ uint32_t ff_mov_get_channel_label(uint32_t label);
  * @param[out] bitmap          channel bitmap
  * @return                     channel layout tag
  */
-uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id,
+uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id,
                                        uint64_t channel_layout,
                                        uint32_t *bitmap);
 
+/**
+ * Read 'chan' tag from the input stream.
+ *
+ * @param s     AVFormatContext
+ * @param pb    AVIOContext
+ * @param st    The stream to set codec values for
+ * @param size  Remaining size in the 'chan' tag
+ * @return      0 if ok, or negative AVERROR code on failure
+ */
+int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
+                     int64_t size);
+
 #endif /* AVFORMAT_MOV_CHAN_H */