diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-09-29 23:25:01 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-29 23:25:01 +0000 |
| commit | fe2d6fe2359b153eee827906140e62f710496a37 (patch) | |
| tree | ec8ff76865fbcb3c7c1a1fa9cf1fc85ec6eb8b67 /libavformat/avformat.h | |
| parent | d1fb157dd79c6e1e02142e9f3ae81e454b8257e8 (diff) | |
| download | ffmpeg-fe2d6fe2359b153eee827906140e62f710496a37.tar.gz | |
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
Originally committed as revision 3540 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7bfe4b111b..f4d83d119b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -5,7 +5,7 @@ extern "C" { #endif -#define LIBAVFORMAT_BUILD 4616 +#define LIBAVFORMAT_BUILD 4617 #define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT #define LIBAVFORMAT_VERSION FFMPEG_VERSION @@ -140,6 +140,7 @@ typedef struct AVOutputFormat { int flags; /* currently only used to set pixel format if not YUV420P */ int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *); + int (*interleave_packet)(struct AVFormatContext *, AVPacket *out, AVPacket *in, int flush); /* private fields */ struct AVOutputFormat *next; } AVOutputFormat; |