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
AgeCommit message (Collapse)Author
2016-08-21avformat/wtvdec: Check pointer before useMichael Niedermayer
Fixes out of array read Fixes: 049fdf78565f1ce5665df236d90f8657/asan_heap-oob_10a5a97_1026_42f9d4855547329560f385768de2f3fb.wtv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-04-10Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis
* commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-20avformat/wtvdec: Set AVFMTCTX_NOHEADERMichael Niedermayer
Needed for noStreams.wtv unless something else forces continued parsing (like looking for more than 1 frame in attachments) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-24Merge commit '29c2d06d67724e994980045afa055c6c34611b30'Derek Buitenhuis
* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-01wtvdec: Removed unused variableTimothy Gu
2016-02-01wtv: Speed up wtv index creationpopcornmix
The index creation is O(N^2) with number of entries (typically thousands). On a Pi this can take more than 60 seconds to execute for a recording of a few hours. By replacing with an O(N) loop, this takes virtually zero time Liked-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12Merge commit 'd80811c94e068085aab797f9ba35790529126f85'Michael Niedermayer
* commit 'd80811c94e068085aab797f9ba35790529126f85': riff: Use the correct logging context Conflicts: libavformat/asfdec_o.c libavformat/avidec.c libavformat/dxa.c libavformat/matroskadec.c libavformat/mov.c libavformat/riff.h libavformat/riffdec.c libavformat/wavdec.c libavformat/wtvdec.c libavformat/xwma.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-02-20avformat/wtvdec: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20wtvdec: fix integer overflow resulting in errors with large filesRodger Combs
This fixes a regression in 9fbc613f0df1628e7e78bca791fa8833846f8210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer
* 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>
2014-12-25avformat/wtvdec: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-18wavdec: RIFX file format supportThomas Volkert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'Michael Niedermayer
* 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>
2014-10-26Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'Michael Niedermayer
* commit '9dcf2397219ca796f0fafce2a703770d6fd09920': lavf: Check the return value of strftime Conflicts: libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'Michael Niedermayer
* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6': wtv: Avoid needlessly calling gmtime twice with the same argument Conflicts: libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'Michael Niedermayer
* commit '9fbc613f0df1628e7e78bca791fa8833846f8210': wtv: check seek_by_sector return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-02Stop demuxing wtv on eof.Carl Eugen Hoyos
Fixes ticket #3991. Fixes ticket #3995. Fixes ticket #3997. Reviewed-by: Peter Ross Reviewed-by: Paul B Mahol
2014-08-29avformat/wtvdec: seek over broken chunksPeter Ross
Fixes ticket #3898 Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08replace calls to url_feof() with avio_feof()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>