mirror of https://git.ffmpeg.org/ffmpeg.git
avformat: remove obsolete FF_API_READ_PACKET cruft
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
ecf457f3ac
commit
ddc3768161
|
@ -2052,24 +2052,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
|
||||||
|
|
|
@ -691,13 +691,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
|
|
||||||
|
|
||||||
|
|
||||||
/**********************************************************/
|
/**********************************************************/
|
||||||
|
|
||||||
|
|
|
@ -61,9 +61,6 @@
|
||||||
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
|
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef FF_API_READ_PACKET
|
|
||||||
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_R_FRAME_RATE
|
#ifndef FF_API_R_FRAME_RATE
|
||||||
#define FF_API_R_FRAME_RATE 1
|
#define FF_API_R_FRAME_RATE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue