diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-05-29 02:06:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-29 02:06:32 +0000 |
| commit | e928649b0bf6c8c7b87eb09d5e393a70387b10e9 (patch) | |
| tree | 3f065adcb0e5c14127d01162d7cc8a0d934c073f /libavformat/avformat.h | |
| parent | a7b2871cd1401ce7be59b153eed3f25565b0bb23 (diff) | |
| download | ffmpeg-e928649b0bf6c8c7b87eb09d5e393a70387b10e9.tar.gz | |
pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though
Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 966d2fd096..ae1f9fe69d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -5,7 +5,7 @@ extern "C" { #endif -#define LIBAVFORMAT_BUILD 4614 +#define LIBAVFORMAT_BUILD 4615 #define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT #define LIBAVFORMAT_VERSION FFMPEG_VERSION @@ -131,9 +131,7 @@ typedef struct AVOutputFormat { enum CodecID audio_codec; /* default audio codec */ enum CodecID video_codec; /* default video codec */ int (*write_header)(struct AVFormatContext *); - int (*write_packet)(struct AVFormatContext *, - int stream_index, - const uint8_t *buf, int size, int64_t pts); + int (*write_packet)(struct AVFormatContext *, AVPacket *pkt); int (*write_trailer)(struct AVFormatContext *); /* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER */ int flags; @@ -558,8 +556,8 @@ int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts /* media file output */ int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap); int av_write_header(AVFormatContext *s); -int av_write_frame(AVFormatContext *s, int stream_index, const uint8_t *buf, - int size); +int av_write_frame(AVFormatContext *s, AVPacket *pkt); + int av_write_trailer(AVFormatContext *s); void dump_format(AVFormatContext *ic, |