diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:22:52 +0100 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /libavformat/swfenc.c | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
| download | ffmpeg-0fecf2642b9d909820683647c70031a954f5e58d.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfenc.c')
| -rw-r--r-- | libavformat/swfenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 182cb65660..052d7205e8 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -326,7 +326,7 @@ static int swf_write_header(AVFormatContext *s) put_swf_end_tag(s); } - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } @@ -432,7 +432,7 @@ static int swf_write_video(AVFormatContext *s, put_swf_tag(s, TAG_SHOWFRAME); put_swf_end_tag(s); - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } @@ -489,7 +489,7 @@ static int swf_write_trailer(AVFormatContext *s) put_swf_tag(s, TAG_END); put_swf_end_tag(s); - put_flush_packet(s->pb); + avio_flush(s->pb); /* patch file size and number of frames if not streamed */ if (!url_is_streamed(s->pb) && video_enc) { |