diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-12-11 11:07:53 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-12-12 22:43:56 +0400 |
commit | c8dffc02fd6fb87f91183b01056d1a323ffadca3 (patch) | |
tree | fa7fe50c32034d6fdac080f3aafaed7cb3964b1a /libavformat | |
parent | 469c62d0025518be994abe328c62b1fc160fe8bf (diff) |
lavf doxy: add av_guess_codec/format to the encoding group.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avformat.h | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 93087cbed2..b35580c681 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); + /** * @} */ |