Browse Source

lavf: remove disabled FF_API_READ_PACKET cruft

tags/n2.0
Anton Khirnov 12 years ago
parent
commit
435c2a31ad
3 changed files with 0 additions and 29 deletions
  1. +0
    -18
      libavformat/avformat.h
  2. +0
    -8
      libavformat/utils.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 18
libavformat/avformat.h View File

@@ -1287,24 +1287,6 @@ int av_find_best_stream(AVFormatContext *ic,
AVCodec **decoder_ret, AVCodec **decoder_ret,
int flags); int flags);


#if FF_API_READ_PACKET
/**
* @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
* unprocessed packets
*
* Read a transport packet from a media file.
*
* This function is obsolete and should never be used.
* Use av_read_frame() instead.
*
* @param s media file handle
* @param pkt is filled
* @return 0 if OK, AVERROR_xxx on error
*/
attribute_deprecated
int av_read_packet(AVFormatContext *s, AVPacket *pkt);
#endif

/** /**
* Return the next frame of a stream. * Return the next frame of a stream.
* This function returns what is stored in the file, and does not validate * This function returns what is stored in the file, and does not validate


+ 0
- 8
libavformat/utils.c View File

@@ -676,14 +676,6 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }


#if FF_API_READ_PACKET
int av_read_packet(AVFormatContext *s, AVPacket *pkt)
{
return ff_read_packet(s, pkt);
}
#endif


/**********************************************************/ /**********************************************************/


/** /**


+ 0
- 3
libavformat/version.h View File

@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time. * the public API and may change, break or disappear at any time.
*/ */


#ifndef FF_API_READ_PACKET
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_INTERLEAVE_PACKET #ifndef FF_API_INTERLEAVE_PACKET
#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55) #define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif #endif


Loading…
Cancel
Save