Browse Source

lavf: remove disabled FF_API_FIND_INFO_TAG cruft

tags/n0.11
Anton Khirnov 14 years ago
parent
commit
cc10ab79ec
3 changed files with 0 additions and 19 deletions
  1. +0
    -7
      libavformat/avformat.h
  2. +0
    -9
      libavformat/utils.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 7
libavformat/avformat.h View File

@@ -1742,13 +1742,6 @@ void av_dump_format(AVFormatContext *ic,
*/
int64_t av_gettime(void);

#if FF_API_FIND_INFO_TAG
/**
* @deprecated use av_find_info_tag in libavutil instead.
*/
attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
#endif

/**
* Return in 'buf' the path with '%d' replaced by a number.
*


+ 0
- 9
libavformat/utils.c View File

@@ -3373,15 +3373,6 @@ uint64_t ff_ntp_time(void)
return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
}

#if FF_API_FIND_INFO_TAG
#include "libavutil/parseutils.h"

int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info)
{
return av_find_info_tag(arg, arg_size, tag1, info);
}
#endif

int av_get_frame_filename(char *buf, int buf_size,
const char *path, int number)
{


+ 0
- 3
libavformat/version.h View File

@@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
*/
#ifndef FF_API_FIND_INFO_TAG
#define FF_API_FIND_INFO_TAG (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_PKT_DUMP
#define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif


Loading…
Cancel
Save