highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'

Browse Source 
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-13 12:37:03 +01:00
commit 06a8350599
4 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/avformat.h
View File

@ -207,10 +207,6 @@
#include "avio.h" #include "avio.h"
#include "libavformat/version.h" #include "libavformat/version.h"
#if FF_API_AV_GETTIME
#include "libavutil/time.h"
#endif
struct AVFormatContext; struct AVFormatContext;
@ -1799,16 +1795,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
*/ */
int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt); int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
#if FF_API_INTERLEAVE_PACKET
/**
* @deprecated this function was never meant to be called by the user
* programs.
*/
attribute_deprecated
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
AVPacket *pkt, int flush);
#endif
/** /**
* Write the stream trailer to an output media file and free the * Write the stream trailer to an output media file and free the
* file private data. * file private data.

9
libavformat/mux.c
View File

@ -699,15 +699,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
} }
} }
#if FF_API_INTERLEAVE_PACKET
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
AVPacket *pkt, int flush)
{
return ff_interleave_packet_per_dts(s, out, pkt, flush);
}
#endif
/** /**
* Interleave an AVPacket correctly so it can be muxed. * Interleave an AVPacket correctly so it can be muxed.
* @param out the interleaved packet will be output here * @param out the interleaved packet will be output here

7
libavformat/utils.c
View File

@ -3631,13 +3631,6 @@ void av_dump_format(AVFormatContext *ic,
av_free(printed); av_free(printed);
} }
#if FF_API_AV_GETTIME && CONFIG_SHARED && HAVE_SYMVER
FF_SYMVER(int64_t, av_gettime, (void), "LIBAVFORMAT_54")
{
return av_gettime();
}
#endif
uint64_t ff_ntp_time(void) uint64_t ff_ntp_time(void)
{ {
return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US; return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;

6
libavformat/version.h
View File

@ -73,12 +73,6 @@
#ifndef FF_API_READ_PACKET #ifndef FF_API_READ_PACKET
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56) #define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_INTERLEAVE_PACKET
#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_AV_GETTIME
#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55)
#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