diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 17:02:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 17:02:30 -0300 |
| commit | 4de591e6fb7361bd417dcd9563672ed0ad8b361b (patch) | |
| tree | ff6b5c51a4891b49f61d53b88bdfb27cc6a89579 /libavformat/wavenc.c | |
| parent | 423375d4f06ae7103e575a31c23e62e3ba440845 (diff) | |
| parent | 83548fe894cdb455cc127f754d09905b6d23c173 (diff) | |
| download | ffmpeg-4de591e6fb7361bd417dcd9563672ed0ad8b361b.tar.gz | |
Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'
* commit '83548fe894cdb455cc127f754d09905b6d23c173':
lavf: fix usage of AVIOContext.seekable
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/wavenc.c')
| -rw-r--r-- | libavformat/wavenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index a21d4c547e..7f3059e99a 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -344,7 +344,7 @@ static int wav_write_header(AVFormatContext *s) } if (s->streams[0]->codecpar->codec_tag != 0x01 /* hence for all other than PCM */ - && s->pb->seekable) { + && (s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { wav->fact_pos = ff_start_tag(pb, "fact"); avio_wl32(pb, 0); ff_end_tag(pb, wav->fact_pos); @@ -425,7 +425,7 @@ static int wav_write_trailer(AVFormatContext *s) avio_flush(pb); - if (s->pb->seekable) { + if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { if (wav->write_peak != 2 && avio_tell(pb) - wav->data < UINT32_MAX) { ff_end_tag(pb, wav->data); avio_flush(pb); @@ -584,7 +584,7 @@ static int w64_write_header(AVFormatContext *s) end_guid(pb, start); if (s->streams[0]->codecpar->codec_tag != 0x01 /* hence for all other than PCM */ - && s->pb->seekable) { + && (s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { start_guid(pb, ff_w64_guid_fact, &wav->fact_pos); avio_wl64(pb, 0); end_guid(pb, wav->fact_pos); @@ -601,7 +601,7 @@ static int w64_write_trailer(AVFormatContext *s) WAVMuxContext *wav = s->priv_data; int64_t file_size; - if (pb->seekable) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { end_guid(pb, wav->data); file_size = avio_tell(pb); |