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/mmf.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/mmf.c')
| -rw-r--r-- | libavformat/mmf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 0f5cee4f71..4605bf7fbd 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -102,7 +102,7 @@ static int mmf_write_header(AVFormatContext *s) av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate); - put_flush_packet(pb); + avio_flush(pb); return 0; } @@ -160,7 +160,7 @@ static int mmf_write_trailer(AVFormatContext *s) avio_seek(pb, pos, SEEK_SET); - put_flush_packet(pb); + avio_flush(pb); } return 0; } @@ -195,7 +195,7 @@ static int mmf_read_header(AVFormatContext *s, file_size = avio_rb32(pb); /* Skip some unused chunks that may or may not be present */ - for(;; avio_seek(pb, size, SEEK_CUR)) { + for(;; avio_skip(pb, size)) { tag = avio_rl32(pb); size = avio_rb32(pb); if(tag == MKTAG('C','N','T','I')) continue; @@ -226,7 +226,7 @@ static int mmf_read_header(AVFormatContext *s, avio_r8(pb); /* time base g */ /* Skip some unused chunks that may or may not be present */ - for(;; avio_seek(pb, size, SEEK_CUR)) { + for(;; avio_skip(pb, size)) { tag = avio_rl32(pb); size = avio_rb32(pb); if(tag == MKTAG('A','t','s','q')) continue; |