diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:37:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:37:03 +0100 |
| commit | 06a83505992d5f49846c18507a6c3eb8a47c650e (patch) | |
| tree | dda157473729622e9797446d4b717f5dab0a9b1c /libavformat/avformat.h | |
| parent | 256e1f7bdfb0f84c7854b6e4147a8b349e12a905 (diff) | |
| parent | 7b486ab13bfcfa88a7cd92586de50e49966ec292 (diff) | |
| download | ffmpeg-06a83505992d5f49846c18507a6c3eb8a47c650e.tar.gz | |
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
* 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>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 0fc71aa9bb..dbb80a1ce3 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -207,10 +207,6 @@ #include "avio.h" #include "libavformat/version.h" -#if FF_API_AV_GETTIME -#include "libavutil/time.h" -#endif - struct AVFormatContext; @@ -1799,16 +1795,6 @@ int av_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 * file private data. |