github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +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

2
libavformat/spdifdec.c
View File

@@ -201,7 +201,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
}
/* skip over the padding to the beginning of the next frame */
avio_seek(pb, offset - pkt->size - BURST_HEADER_SIZE, SEEK_CUR);
avio_skip(pb, offset - pkt->size - BURST_HEADER_SIZE);
if (!s->nb_streams) {
/* first packet, create a stream */