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/img.c | |
| 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/img.c')
| -rw-r--r-- | libavformat/img.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/img.c b/libavformat/img.c index 9c47d38626..468cb6e2f0 100644 --- a/libavformat/img.c +++ b/libavformat/img.c @@ -300,11 +300,10 @@ static int img_write_header(AVFormatContext *s) return 0; } -static int img_write_packet(AVFormatContext *s, int stream_index, - const uint8_t *buf, int size, int64_t pts) +static int img_write_packet(AVFormatContext *s, AVPacket *pkt) { VideoData *img = s->priv_data; - AVStream *st = s->streams[stream_index]; + AVStream *st = s->streams[pkt->stream_index]; ByteIOContext pb1, *pb; AVPicture *picture; int width, height, ret; @@ -314,7 +313,7 @@ static int img_write_packet(AVFormatContext *s, int stream_index, width = st->codec.width; height = st->codec.height; - picture = (AVPicture *)buf; + picture = (AVPicture *)pkt->data; if (!img->is_pipe) { if (get_frame_filename(filename, sizeof(filename), |