eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

pass AVPacket into av_write_frame()

Browse Source 
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
This commit is contained in:
Michael Niedermayer
2004-05-29 02:06:32 +00:00
parent a7b2871cd1
commit e928649b0b
33 changed files with 328 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mpjpeg.c
View File

@@ -33,14 +33,13 @@ static int mpjpeg_write_header(AVFormatContext *s)
return 0;
}
static int mpjpeg_write_packet(AVFormatContext *s, int stream_index,
const uint8_t *buf, int size, int64_t pts)
static int mpjpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
{
uint8_t buf1[256];
snprintf(buf1, sizeof(buf1), "Content-type: image/jpeg\n\n");
put_buffer(&s->pb, buf1, strlen(buf1));
put_buffer(&s->pb, buf, size);
put_buffer(&s->pb, pkt->data, pkt->size);
snprintf(buf1, sizeof(buf1), "\n--%s\n", BOUNDARY_TAG);
put_buffer(&s->pb, buf1, strlen(buf1));
@@ -75,10 +74,9 @@ static int single_jpeg_write_header(AVFormatContext *s)
return 0;
}
static int single_jpeg_write_packet(AVFormatContext *s, int stream_index,
const uint8_t *buf, int size, int64_t pts)
static int single_jpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
{
put_buffer(&s->pb, buf, size);
put_buffer(&s->pb, pkt->data, pkt->size);
put_flush_packet(&s->pb);
return 1; /* no more data can be sent */
}