opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'newdev/master'

Browse Source 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-03-17 16:53:58 +01:00
parent e309fdc701 f1f60f5252
commit 0fecf2642b
174 changed files with 1109 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mmf.c
View File

@ -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;