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/swf.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/swf.c')
| -rw-r--r-- | libavformat/swf.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/swf.c b/libavformat/swf.c index 3f5ddd1678..798c9b1ee3 100644 --- a/libavformat/swf.c +++ b/libavformat/swf.c @@ -700,14 +700,13 @@ static int swf_write_audio(AVFormatContext *s, return 0; } -static int swf_write_packet(AVFormatContext *s, int stream_index, - const uint8_t *buf, int size, int64_t pts) +static int swf_write_packet(AVFormatContext *s, AVPacket *pkt) { - AVCodecContext *codec = &s->streams[stream_index]->codec; + AVCodecContext *codec = &s->streams[pkt->stream_index]->codec; if (codec->codec_type == CODEC_TYPE_AUDIO) - return swf_write_audio(s, codec, buf, size); + return swf_write_audio(s, codec, pkt->data, pkt->size); else - return swf_write_video(s, codec, buf, size); + return swf_write_video(s, codec, pkt->data, pkt->size); } static int swf_write_trailer(AVFormatContext *s) |