Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/wtvdec.c
AgeCommit message (Collapse)Author
2014-05-01avformat/wtvdec: ignore mpeg2 extradataPeter Ross
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>
2014-04-04avformat/wtvdec: populate codec_tag from BITMAPINFOHEADERPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalidPeter Ross
Fixes ticket #3522. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30avformat/wtvdec: demux mpeg2 extradataPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer
* 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>
2013-12-23wtv: make ff_format_videoinfo2 visible to wtv encoderPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-23wtvenc: test avio_size() validityPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21wtvdec: when testing for truncated files, actually check the .wtv file sizePeter Ross
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>
2013-11-03Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'Michael Niedermayer
* commit 'c0bba95c2363641d3297b3852b2ece1474cda295': wtv: fix variable sign in format Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19avformat/wtvdec: drop SHIFT_SECTOR_BITS() macroMichael Niedermayer
it just wraps around a bitwise shift, and makes the code harder to read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: wtv: Seek by sector properly Conflicts: libavformat/wtvdec.c See: a0d13d84a928110b0e99ea16d17fd758fcbde35f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17Add some necessary casts in the wtv demuxer.Carl Eugen Hoyos
This reverts e8023dba, fixes ticket #3049.
2013-09-20Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'Michael Niedermayer
* 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>
2013-07-27Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: wtv: Drop some casts that now are unnecessary Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: wtv: Mark attachment with a negative stream id Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24avformat/wtvdec: fix doxygen commentsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20wtvdec: fix integer overflowMichael Niedermayer
Fixes CID968583 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07wtvdec: prevent memory leak in get_tag()Peter Ross
2013-01-07wtvdec: warn about truncated filesPeter Ross
2013-01-07wtvdec: ignore WM/MediaThumbType metadata entryPeter Ross
This tag is used by Windows Media Centre in displaying the thumbnail, and should be transformed into FFmpeg metadata string.
2013-01-07wtvdec: demux thumbnail picture to AVStream.attached_picPeter Ross
2012-12-18wtv: permit root table and first sectors to be located beyond 2GB boundaryPeter Ross
Fixes ticket #2025. Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-03wtvdec: fix null pointer dereferenceMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-11-06wtv: move duplicated guids into wtv.cPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENTPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23wtvdec: display warning for encrypted wtv files (instead of 'unsupported ↵Peter Ross
chunk' messages) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13wtvdec: fix memleak on errorMichael Niedermayer
Fixes CID718002 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07wtvdec: Remove unused strings.h headerDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31wtvdec: set correct codec ID for CC streams.Reimar Döffinger
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>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* 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>
2012-07-06cosmetics: various spelling fixesLou Logan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-02lavf/wtvdec: add missing { } around if.Clément Bœsch
This should fix the current failures spotted by FATE.
2012-07-02wtvdec: return error when filetime_to_iso8601/crazytime_to_iso8601 ↵Peter Ross
conversion fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-05-31libavformat: ff_get_bmp_header: return esize tooMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-22wtvdec: Check that stream private context has been allocated before use.Michael Niedermayer
This fixes a null ptr dereference with attachments Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-14wtvdec: fix name_size check to consider integer overflows.Michael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-12wtvdec: fix a few memleaks as show by valgrind with the FATE test.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fft: init functions with INIT_XMM/YMM. pcmenc: set frame_size to 0. gsm demuxer: use generic seeking instead of a gsm-specific function. gsm demuxer: return packets with only 1 gsm block at a time. avcodec: add GSM parser doc: Replace ffmpeg references in avserver config file by avconv. doc: Fix names of av_log color environment variables. Fix a bunch of platform name and other typos. Add some missing changelog entries and release 0.8_beta2 No longer build libpostproc by default wtv: fix memleaks during normal operation threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs Conflicts: Changelog RELEASE cmdutils.c configure doc/ffserver.conf doc/platform.texi ffplay.c libavcodec/Makefile libavcodec/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03wtvdec: use intfloat.h instead of intfloat_readwrite.hJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().Clément Bœsch
2011-11-06wtvdec: ignore another known guidPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14[wtv] Check return value of avio_seek and avoid modifying state if it failsJoakim Plate
2011-09-08WTV muxer (1_extract_wtv_common_code.patch)zhentan feng
2011-07-15wtvdec: also support big-sectors when fat depth is zeroPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 10:15:21 +0300