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/mux.c | |
| parent | 256e1f7bdfb0f84c7854b6e4147a8b349e12a905 (diff) | |
| parent | 7b486ab13bfcfa88a7cd92586de50e49966ec292 (diff) | |
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/mux.c')
| -rw-r--r-- | libavformat/mux.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 0d74d96ab8..3578a52034 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -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. * @param out the interleaved packet will be output here |