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/mpjpeg.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/mpjpeg.c')
| -rw-r--r-- | libavformat/mpjpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index e98fb363e7..e6f6bcc5f6 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -30,7 +30,7 @@ static int mpjpeg_write_header(AVFormatContext *s) snprintf(buf1, sizeof(buf1), "--%s\n", BOUNDARY_TAG); avio_write(s->pb, buf1, strlen(buf1)); - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } @@ -44,7 +44,7 @@ static int mpjpeg_write_packet(AVFormatContext *s, AVPacket *pkt) snprintf(buf1, sizeof(buf1), "\n--%s\n", BOUNDARY_TAG); avio_write(s->pb, buf1, strlen(buf1)); - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } |