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/yuv4mpeg.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/yuv4mpeg.c')
| -rw-r--r-- | libavformat/yuv4mpeg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 1520b34635..1a18ad03ea 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -58,10 +58,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) return n; } -static int yuv4_write_packet(AVFormatContext *s, int stream_index, - const uint8_t *buf, int size, int64_t pts) +static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) { - AVStream *st = s->streams[stream_index]; + AVStream *st = s->streams[pkt->stream_index]; ByteIOContext *pb = &s->pb; AVPicture *picture; int* first_pkt = s->priv_data; @@ -71,7 +70,7 @@ static int yuv4_write_packet(AVFormatContext *s, int stream_index, char buf1[20]; uint8_t *ptr, *ptr1, *ptr2; - picture = (AVPicture *)buf; + picture = (AVPicture *)pkt->data; /* for the first packet we have to output the header as well */ if (*first_pkt) { |