ccdfa3e271
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add missing #includes for *INT64_MAX and *INT64_C
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-24 05:21:19 +01:00
8f8bc92365
Add missing #includes for *INT64_MAX and *INT64_C
2013-11-23 21:55:52 +01:00
6abb9eb525
avformat/wavdec: Fix smv packet interleaving
...
This strips the relative timestamp "flag" off.
Fixes Ticket2849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-25 12:50:26 +02:00
a807c68253
avformat: use ff_alloc_extradata()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-13 20:13:38 +00:00
83fc6c822b
avformat/wavdec: Dont trust the fact chunk for PCM
...
Fixes Ticket3033
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-09 22:18:19 +02:00
e024953722
avformat/wavdec: check smv_frames_per_jpeg
...
Values outside would not be possible due to limitations of jpeg itself
Fixes very long running loop
Fixes Ticket2977
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-26 14:56:32 +02:00
3e36dc8626
w64dec: fix end position of summarylist guid
...
Noticed-by: James Almer
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-03 01:03:10 +00:00
79b70e47a4
w64dec: fix skipping of unknown guids
...
Regression since 14d50c1Fixes #2932 .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-02 22:55:46 +00:00
dc2e4c2e53
lavf/wavdec: Fix seeking in files with unaligned offsets
...
A file with a prepended ID3 tag of an uneven length was found
in the wild.
Check if the wav data starts at an uneven offset and use that
information to correct the seeking calculation in wav_seek_tag,
which used to only seek to even byte positions.
Regression since ac87eaf856eclipse7@gmx.net >
2013-08-14 22:05:41 +02:00
2a91038e13
avformat/wavdec: Dont rescale timestamps but use exact comparission
...
Fixes integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-08 20:02:22 +02:00
14ec9d2590
Support playing SMV files.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-22 15:20:22 +02:00
09602dbe7a
wav_seek_tag: fix integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-06 10:58:31 +02:00
5cb9093aa8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wav: Always seek to an even offset
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-06 10:47:49 +02:00
ac87eaf856
wav: Always seek to an even offset
...
RIFF chunks are aligned to 16bit according to the specification.
Bug-Id:500
CC:libav-stable@libav.org
2013-05-06 09:14:43 +02:00
097f668047
avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
...
Demuxers where the changed code looked less readable where skiped
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-05 13:34:56 +02:00
23a7c32a7a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wav: return meaningful errors
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-04 10:33:50 +02:00
0104570fb6
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
...
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-04 10:17:52 +02:00
69467fb64b
wav: return meaningful errors
2013-05-03 19:56:06 +02:00
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
482c1ac849
Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
...
* commit '13f57a4d881ec669b87bf82f424bfff502433060':
wav: K&R formatting cosmetics
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-03 11:06:27 +02:00
13f57a4d88
wav: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-05-02 19:04:22 +02:00
1f2ce32825
lavf/wavdec: skip padding byte
...
WAV chunks must be even aligned. This patch skip the extra padding byte
if chunk size is odd.
Fixes ticket #2417 .
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-08 20:13:40 +02:00
3174137d41
w64: fact guid support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-07 10:08:38 +00:00
1ae9d2820e
Support decoding AC-3 in wav.
...
All known samples are actually ac3-in-spdif-in-wav, so use
the spdif demuxer to get the ac3 frames.
2013-01-06 18:48:51 +01:00
14d50c19dc
w64dec: support metadata (summarylist guid)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-05 11:03:52 +00:00
9a74282644
Sony Wave64 muxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-12-31 07:10:57 +00:00
d59d39e164
wavdec: fix duration calculation for files with invalid data size
...
Some wav files report a data size that is bigger than the actual file size.
Fall back to estimation from bitrate in such cases.
Fixes ticket #2065 .
Signed-off-by: James Almer <jamrial@gmail.com >
2012-12-29 17:46:01 +00:00
09456d0df1
riff: ignore ff_read_riff_info() failure.
...
Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-23 23:41:57 +01:00
775d41b617
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Add support for Tilera processors
wavdec: check size before reading the data, not after.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 15:53:42 +02:00
df5e089da9
Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'
...
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
lavf: split wav muxer and demuxer into separate files.
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 15:46:08 +02:00
a43283b6f4
wavdec: check size before reading the data, not after.
2012-10-16 18:52:21 +02:00
79922d7237
wav: do not fail on empty INFO tags
...
Fixes Bug 379
CC: libav-stable@libav.org
2012-10-16 18:52:14 +02:00
31c54711cc
lavf: split wav muxer and demuxer into separate files.
2012-10-16 18:52:07 +02:00
