[FFmpeg-cvslog] lavf doxy: add av_guess_codec/format to the encoding group.
Anton Khirnov
git at videolan.org
Tue Dec 13 00:59:45 CET 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Dec 11 08:07:53 2011 +0100| [c8dffc02fd6fb87f91183b01056d1a323ffadca3] | committer: Anton Khirnov
lavf doxy: add av_guess_codec/format to the encoding group.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8dffc02fd6fb87f91183b01056d1a323ffadca3
---
libavformat/avformat.h | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 93087cb..b35580c 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1213,29 +1213,6 @@ attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename);
#endif
/**
- * Return the output format in the list of registered output formats
- * which best matches the provided parameters, or return NULL if
- * there is no match.
- *
- * @param short_name if non-NULL checks if short_name matches with the
- * names of the registered formats
- * @param filename if non-NULL checks if filename terminates with the
- * extensions of the registered formats
- * @param mime_type if non-NULL checks if mime_type matches with the
- * MIME type of the registered formats
- */
-AVOutputFormat *av_guess_format(const char *short_name,
- const char *filename,
- const char *mime_type);
-
-/**
- * Guess the codec ID based upon muxer and filename.
- */
-enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
- const char *filename, const char *mime_type,
- enum AVMediaType type);
-
-/**
* Send a nice hexadecimal dump of a buffer to the specified file stream.
*
* @param f The file stream pointer where the dump should be sent to.
@@ -1785,6 +1762,30 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
* @return 0 if OK, AVERROR_xxx on error
*/
int av_write_trailer(AVFormatContext *s);
+
+/**
+ * Return the output format in the list of registered output formats
+ * which best matches the provided parameters, or return NULL if
+ * there is no match.
+ *
+ * @param short_name if non-NULL checks if short_name matches with the
+ * names of the registered formats
+ * @param filename if non-NULL checks if filename terminates with the
+ * extensions of the registered formats
+ * @param mime_type if non-NULL checks if mime_type matches with the
+ * MIME type of the registered formats
+ */
+AVOutputFormat *av_guess_format(const char *short_name,
+ const char *filename,
+ const char *mime_type);
+
+/**
+ * Guess the codec ID based upon muxer and filename.
+ */
+enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+ const char *filename, const char *mime_type,
+ enum AVMediaType type);
+
/**
* @}
*/
More information about the ffmpeg-cvslog
mailing list