diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-10 20:47:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-10 20:47:46 +0200 |
| commit | 72527d9c54a95454153e971d11f114f2a4f19073 (patch) | |
| tree | f30796d5c61e24bc0f6eecc56b118fb4bf16617a /libavformat | |
| parent | 47d077337a62f3ece41ee90a4d5000876d5c46d1 (diff) | |
| parent | 872fab4a3df48e7e6484333ee2228c684e319634 (diff) | |
| download | ffmpeg-72527d9c54a95454153e971d11f114f2a4f19073.tar.gz | |
Merge commit '872fab4a3df48e7e6484333ee2228c684e319634'
* commit '872fab4a3df48e7e6484333ee2228c684e319634':
asfdec: Fix reading from the pipe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec_o.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 016af0c1ed..90e5c7e293 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -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; } |