Revision 58d5ff0a

View differences:

libavformat/avformat.h
1409 1409
                    const char *url,
1410 1410
                    int is_output);
1411 1411

  
1412
#if FF_API_PARSE_FRAME_PARAM
1413
/**
1414
 * Parse width and height out of string str.
1415
 * @deprecated Use av_parse_video_frame_size instead.
1416
 */
1417
attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
1418
                                          const char *str);
1419

  
1420
/**
1421
 * Convert framerate from a string to a fraction.
1422
 * @deprecated Use av_parse_video_frame_rate instead.
1423
 */
1424
attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
1425
                                          const char *arg);
1426
#endif
1427

  
1428 1412
#if FF_API_PARSE_DATE
1429 1413
/**
1430 1414
 * Parse datestr and return a corresponding number of microseconds.
libavformat/utils.c
3320 3320
    av_free(printed);
3321 3321
}
3322 3322

  
3323
#if FF_API_PARSE_FRAME_PARAM
3324
#include "libavutil/parseutils.h"
3325

  
3326
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
3327
{
3328
    return av_parse_video_size(width_ptr, height_ptr, str);
3329
}
3330

  
3331
int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
3332
{
3333
    AVRational frame_rate;
3334
    int ret = av_parse_video_rate(&frame_rate, arg);
3335
    *frame_rate_num= frame_rate.num;
3336
    *frame_rate_den= frame_rate.den;
3337
    return ret;
3338
}
3339
#endif
3340

  
3341 3323
int64_t av_gettime(void)
3342 3324
{
3343 3325
    struct timeval tv;
libavformat/version.h
47 47
#ifndef FF_API_URL_CLASS
48 48
#define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
49 49
#endif
50
#ifndef FF_API_PARSE_FRAME_PARAM
51
#define FF_API_PARSE_FRAME_PARAM       (LIBAVFORMAT_VERSION_MAJOR < 53)
52
#endif
53 50
#ifndef FF_API_READ_SEEK
54 51
#define FF_API_READ_SEEK               (LIBAVFORMAT_VERSION_MAJOR < 54)
55 52
#endif

Also available in: Unified diff