summaryrefslogtreecommitdiff
path: root/libavformat/wtvdec.c
Commit message (Collapse)AuthorAge
* avformat/wtvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: fix integer overflow resulting in errors with large filesRodger Combs2015-02-20
| | | | | | This fixes a regression in 9fbc613f0df1628e7e78bca791fa8833846f8210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-14
| | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-25
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wavdec: RIFX file format supportThomas Volkert2014-12-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'Michael Niedermayer2014-10-26
| | | | | | | | | | | | | * commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de': Use gmtime_r instead of gmtime and localtime_r instead of localtime Conflicts: libavformat/mov.c libavformat/mxfenc.c libavformat/wtvdec.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'Michael Niedermayer2014-10-26
| | | | | | | | | | * commit '9dcf2397219ca796f0fafce2a703770d6fd09920': lavf: Check the return value of strftime Conflicts: libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'Michael Niedermayer2014-10-26
| | | | | | | | | | * commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6': wtv: Avoid needlessly calling gmtime twice with the same argument Conflicts: libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'Michael Niedermayer2014-10-20
| | | | | | | * commit '9fbc613f0df1628e7e78bca791fa8833846f8210': wtv: check seek_by_sector return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Stop demuxing wtv on eof.Carl Eugen Hoyos2014-10-02
| | | | | | | | | Fixes ticket #3991. Fixes ticket #3995. Fixes ticket #3997. Reviewed-by: Peter Ross Reviewed-by: Paul B Mahol
* avformat/wtvdec: seek over broken chunksPeter Ross2014-08-29
| | | | | | | Fixes ticket #3898 Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: ignore mpeg2 extradataPeter Ross2014-05-01
| | | | | | | | | | | | Files produced by windows media center contain meaningless mpeg1 sequence header. The mpeg2 decoder detects the presence mpeg1 sequence header start codes and attempts to decode the stream as mpeg1. (This problem introduced in 73a2d16b.) Fixes ticket #3601. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: populate codec_tag from BITMAPINFOHEADERPeter Ross2014-04-04
| | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalidPeter Ross2014-04-04
| | | | | | | Fixes ticket #3522. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: demux mpeg2 extradataPeter Ross2014-03-30
| | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-11
| | | | | | | | | | | | | | | | | | | | | * commit 'd92024f18fa3d69937cb2575f3a8bf973df02430': lavf: more correct printf format specifiers Conflicts: libavformat/asfdec.c libavformat/cafdec.c libavformat/dxa.c libavformat/framecrcenc.c libavformat/hnm.c libavformat/iff.c libavformat/mov.c libavformat/mxfdec.c libavformat/rmdec.c libavformat/rpl.c libavformat/smacker.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* wtv: make ff_format_videoinfo2 visible to wtv encoderPeter Ross2013-12-23
| | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvenc: test avio_size() validityPeter Ross2013-12-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: when testing for truncated files, actually check the .wtv file sizePeter Ross2013-12-21
| | | | | | | | Previously the demuxer was testing against avio_tell, and this would generate many false warnings. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'Michael Niedermayer2013-11-03
| | | | | | | * commit 'c0bba95c2363641d3297b3852b2ece1474cda295': wtv: fix variable sign in format Merged-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: drop SHIFT_SECTOR_BITS() macroMichael Niedermayer2013-10-19
| | | | | | it just wraps around a bitwise shift, and makes the code harder to read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-19
| | | | | | | | | | | * qatar/master: wtv: Seek by sector properly Conflicts: libavformat/wtvdec.c See: a0d13d84a928110b0e99ea16d17fd758fcbde35f Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Add some necessary casts in the wtv demuxer.Carl Eugen Hoyos2013-10-17
| | | | This reverts e8023dba, fixes ticket #3049.
* Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'Michael Niedermayer2013-09-20
| | | | | | | | | | | * commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947': wtv: Add more sanity checks for a length read from the file Conflicts: libavformat/wtv.c See: c42efad3c34cace09555e05fd0cb81cb59cc726f Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-27
| | | | | | | | | | * qatar/master: wtv: Drop some casts that now are unnecessary Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-07
| | | | | | | | | | * qatar/master: wtv: Mark attachment with a negative stream id Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wtvdec: fix doxygen commentsMichael Niedermayer2013-05-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: fix integer overflowMichael Niedermayer2013-01-20
| | | | | Fixes CID968583 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: prevent memory leak in get_tag()Peter Ross2013-01-08
|
* wtvdec: warn about truncated filesPeter Ross2013-01-07
|
* wtvdec: ignore WM/MediaThumbType metadata entryPeter Ross2013-01-07
| | | | | This tag is used by Windows Media Centre in displaying the thumbnail, and should be transformed into FFmpeg metadata string.
* wtvdec: demux thumbnail picture to AVStream.attached_picPeter Ross2013-01-07
|
* wtv: permit root table and first sectors to be located beyond 2GB boundaryPeter Ross2012-12-19
| | | | | | Fixes ticket #2025. Signed-off-by: Peter Ross <pross@xvid.org>
* wtvdec: fix null pointer dereferenceMichael Niedermayer2012-12-02
| | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) yop: set channel layout wtv: set channel layout for mpeg audio westwood_aud: set channel layout wc3movie: set channel layout tmv: set channel layout tiertexseq: set channel layout swfdec: set channel layout sol: set channel layout smacker: set channel layout siff: set channel layout sierravmd: set channel layout rtpdec_amr: set channel layout rsodec: set channel layout rmdec: set channel layout for RA version 3 qcp: set channel layout psxstr: set channel layout omadec: set channel layout oggparsespeex: validate channel count and set channel layout nuv: set channel layout mxg: set channel layout ... Conflicts: libavformat/swfdec.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* wtv: move duplicated guids into wtv.cPeter Ross2012-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENTPeter Ross2012-11-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: display warning for encrypted wtv files (instead of 'unsupported ↵Peter Ross2012-10-23
| | | | | | chunk' messages) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: fix memleak on errorMichael Niedermayer2012-10-13
| | | | | Fixes CID718002 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: Remove unused strings.h headerDerek Buitenhuis2012-09-07
| | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: set correct codec ID for CC streams.Reimar Döffinger2012-08-31
| | | | | | | | | | | | 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>
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* cosmetics: various spelling fixesLou Logan2012-07-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/wtvdec: add missing { } around if.Clément Bœsch2012-07-02
| | | | This should fix the current failures spotted by FATE.
* wtvdec: return error when filetime_to_iso8601/crazytime_to_iso8601 ↵Peter Ross2012-07-02
| | | | | | conversion fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-25
| | | | | | | | | | | | | * qatar/master: wtv: Check the return value from gmtime x86: fft: convert sse inline asm to yasm x86: place some inline asm under #if HAVE_INLINE_ASM Conflicts: libavcodec/x86/fft_sse.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat: ff_get_bmp_header: return esize tooMichael Niedermayer2012-05-31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: Check that stream private context has been allocated before use.Michael Niedermayer2012-04-22
| | | | | | | This fixes a null ptr dereference with attachments Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: fix name_size check to consider integer overflows.Michael Niedermayer2012-04-14
| | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 14:58:15 +0000