RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '872fab4a3df48e7e6484333ee2228c684e319634' 

* commit '872fab4a3df48e7e6484333ee2228c684e319634':
  asfdec: Fix reading from the pipe

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-10 20:47:42 +02:00
parent 47d077337a 872fab4a3d
commit 72527d9c54
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/asfdec_o.c
View File

@ -922,7 +922,8 @@ static int asf_read_data(AVFormatContext *s, const GUIDParseTable *g)
size, asf->nb_packets);
avio_skip(pb, 2); // skip reserved field
asf->first_packet_offset = avio_tell(pb);
align_position(pb, asf->offset, asf->data_size);
if (pb->seekable)
align_position(pb, asf->offset, asf->data_size);
return 0;
}