Mercurial > libavcodec.hg
comparison avcodec.h @ 12280:fbc6fc80e6c6 libavcodec
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.
This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.
author | stefano |
---|---|
date | Mon, 26 Jul 2010 23:12:28 +0000 |
parents | 8de66be22d87 |
children | bfc36c0fea55 |
comparison
equal
deleted
inserted
replaced
12279:7fb91885433c | 12280:fbc6fc80e6c6 |
---|---|
29 #include <errno.h> | 29 #include <errno.h> |
30 #include "libavutil/avutil.h" | 30 #include "libavutil/avutil.h" |
31 | 31 |
32 #define LIBAVCODEC_VERSION_MAJOR 52 | 32 #define LIBAVCODEC_VERSION_MAJOR 52 |
33 #define LIBAVCODEC_VERSION_MINOR 84 | 33 #define LIBAVCODEC_VERSION_MINOR 84 |
34 #define LIBAVCODEC_VERSION_MICRO 0 | 34 #define LIBAVCODEC_VERSION_MICRO 1 |
35 | 35 |
36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
37 LIBAVCODEC_VERSION_MINOR, \ | 37 LIBAVCODEC_VERSION_MINOR, \ |
38 LIBAVCODEC_VERSION_MICRO) | 38 LIBAVCODEC_VERSION_MICRO) |
39 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \ | 39 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \ |
3962 * @param v size of extradata in bytes | 3962 * @param v size of extradata in bytes |
3963 * @return number of bytes written to the buffer. | 3963 * @return number of bytes written to the buffer. |
3964 */ | 3964 */ |
3965 unsigned int av_xiphlacing(unsigned char *s, unsigned int v); | 3965 unsigned int av_xiphlacing(unsigned char *s, unsigned int v); |
3966 | 3966 |
3967 #if LIBAVCODEC_VERSION_MAJOR < 53 | |
3967 /** | 3968 /** |
3968 * Parse str and put in width_ptr and height_ptr the detected values. | 3969 * Parse str and put in width_ptr and height_ptr the detected values. |
3969 * | 3970 * |
3970 * @return 0 in case of a successful parsing, a negative value otherwise | 3971 * @deprecated Deprecated in favor of av_parse_video_size(). |
3971 * @param[in] str the string to parse: it has to be a string in the format | 3972 */ |
3972 * width x height or a valid video frame size abbreviation. | 3973 attribute_deprecated int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str); |
3973 * @param[in,out] width_ptr pointer to the variable which will contain the detected | |
3974 * frame width value | |
3975 * @param[in,out] height_ptr pointer to the variable which will contain the detected | |
3976 * frame height value | |
3977 */ | |
3978 int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str); | |
3979 | 3974 |
3980 /** | 3975 /** |
3981 * Parse str and store the detected values in *frame_rate. | 3976 * Parse str and store the detected values in *frame_rate. |
3982 * | 3977 * |
3983 * @return 0 in case of a successful parsing, a negative value otherwise | 3978 * @deprecated Deprecated in favor of av_parse_video_rate(). |
3984 * @param[in] str the string to parse: it has to be a string in the format | 3979 */ |
3985 * frame_rate_num / frame_rate_den, a float number or a valid video rate abbreviation | 3980 attribute_deprecated int av_parse_video_frame_rate(AVRational *frame_rate, const char *str); |
3986 * @param[in,out] frame_rate pointer to the AVRational which will contain the detected | 3981 #endif |
3987 * frame rate | |
3988 */ | |
3989 int av_parse_video_frame_rate(AVRational *frame_rate, const char *str); | |
3990 | 3982 |
3991 /** | 3983 /** |
3992 * Logs a generic warning message about a missing feature. This function is | 3984 * Logs a generic warning message about a missing feature. This function is |
3993 * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) | 3985 * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) |
3994 * only, and would normally not be used by applications. | 3986 * only, and would normally not be used by applications. |