Peter Ross
8469fc17e2
wtvdec: display warning for encrypted wtv files (instead of 'unsupported chunk' messages)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e47024d72f
wtvdec: fix memleak on error
...
Fixes CID718002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Derek Buitenhuis
1d4c4b0fbc
wtvdec: Remove unused strings.h header
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Reimar Döffinger
dddd006cab
wtvdec: set correct codec ID for CC streams.
...
Closed caption data is definitely not teletext.
Since it contains a EIA-608 compatibility stream,
the EIA_608 codec ID is at least not completely wrong.
Fixes subtitle playback in MPlayer with the sample in
trac ticket #1482 .
To fix the ticket itself I expect FFmpeg will need
a closed-caption to SRT decoder first.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Lou Logan
b22ecbc6a5
cosmetics: various spelling fixes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
c855ce2671
lavf/wtvdec: add missing { } around if.
...
This should fix the current failures spotted by FATE.
13 years ago
Peter Ross
c4e0e74438
wtvdec: return error when filetime_to_iso8601/crazytime_to_iso8601 conversion fails
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
76853a3e0c
libavformat: ff_get_bmp_header: return esize too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
fd2127ad53
wtvdec: Check that stream private context has been allocated before use.
...
This fixes a null ptr dereference with attachments
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
c42efad3c3
wtvdec: fix name_size check to consider integer overflows.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Reimar Döffinger
742b660eb7
wtvdec: fix a few memleaks as show by valgrind with the FATE test.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Jean First
f2eb2e5c4f
wtvdec: use intfloat.h instead of intfloat_readwrite.h
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
215b7724e7
lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
13 years ago
Peter Ross
3b4798a873
wtvdec: ignore another known guid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Joakim Plate
7bcd81299a
[wtv] Check return value of avio_seek and avoid modifying state if it fails
13 years ago
zhentan feng
42d4df06e1
WTV muxer (1_extract_wtv_common_code.patch)
13 years ago
Peter Ross
e6cc30c22b
wtvdec: also support big-sectors when fat depth is zero
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Aurelien Jacobs
e6ba3d4281
replace remaining usage of deprecated av_metadata_set2() by av_dict_set()
14 years ago
Michael Niedermayer
25308afbb2
wtvdec: Avoid gmtime_r() it breaks compile on windows.
...
Better solutions welcome, this is just a quick fix to unbreak compile.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Peter Ross
fddf0521c6
wtv: calculate ole date correctly (is seconds since 1899-12-30)
14 years ago
Peter Ross
8acab7ae5b
wtv: detect ole date overflow
14 years ago
zhentan feng
5edb23295e
WTV: Add ff_ prefix to the moved fields.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
zhentan feng
5ab826c165
WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file wtv.h and wtv.c.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
zhentan feng
80a330679f
rename wtv.c to wtvdec.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Max Horn
ca402f32e3
handle malloc failures in ff_get_wav_header
...
ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.
To address this, change ff_get_wav_header to return an error if
allocation failed, and adapted all calling code to handle that error.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Peter Ross
36ffabc4ee
move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Anton Khirnov
f5b386afab
Reemove remaining uses of deprecated AVERROR_NOTSUPP.
14 years ago
Anton Khirnov
e42500cb4f
lavf: replace some more avio_seek(SEEK_CUR) with avio_skip
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
3e68b3ba7b
avio: deprecate url_ferror
...
AVIOContext.error should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
)
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
74b3f67c9c
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2
)
14 years ago
Anton Khirnov
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
)
14 years ago
Anton Khirnov
e356fc57a2
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
)
14 years ago
Anton Khirnov
90ed2776ea
avio: rename av_alloc_put_byte -> avio_alloc_context for consistency
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8d9ac969cb
)
14 years ago
Anton Khirnov
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
8d9ac969cb
avio: rename av_alloc_put_byte -> avio_alloc_context for consistency
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Peter Ross
e590448c65
wtv: ignore empty data_guid chunks
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1a973feb45
)
14 years ago
Peter Ross
1a973feb45
wtv: ignore empty data_guid chunks
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Peter Ross
fe1752865e
wtv: mark streams intended for hearing or visual impaired persons
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 68137ba386
)
14 years ago
Peter Ross
68137ba386
wtv: mark streams intended for hearing or visual impaired persons
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
Peter Ross
9979dcd40e
reindent after last commit
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74571e333c
)
14 years ago
Peter Ross
699d55fb12
wtv: do not use flag in stream_guid chunk to determine if stream is valid, as this method is unreliable
...
This fixes roundup issue 2556.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e4f85b8499
)
14 years ago