summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
Commit message (Collapse)AuthorAge
* avformat/avidec: add mp2 to the list of exceptions instead of generally ↵Michael Niedermayer2015-05-17
| | | | | | | | treating dshow_block_align==1 special Fixes Ticket4552 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'Michael Niedermayer2015-05-10
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81': avi: Validate sample_size Conflicts: libavformat/avidec.c See: ca234639ac49a0dc073ac1f10977979acdb94f97 See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: Validate sample_sizeAndreas Cadhalpun2015-05-09
| | | | | | | | | | | | | | And either error out or set it to 0 if it is negative. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/avidec: print a warning for negative sample_sizeMichael Niedermayer2015-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: avoid infinite loop due to negative ast->sample_sizeAndreas Cadhalpun2015-05-05
| | | | | | | | | | | | | | | | | | | | | | | | If max in clean_index is set to a negative ast->sample_size, the following loop never ends: while (max < 1024) max += max; Thus set ast->sample_size to 0 if it would otherwise be negative. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: check for valid bit_rate rangeAndreas Cadhalpun2015-05-04
| | | | | | | | | | | | | | | | | | | | If bit_rate is negative, it can trigger an av_assert2 in av_rescale_rnd. Since av_rescale returns int64_t, but st->codec_bit_rate is int, it can also overflow into a negative value. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Do not call av_log() per byte, use ff_tlog()Michael Niedermayer2015-04-20
| | | | | | | | | | | | This was av_dlog() previously and should not have been changed to av_log() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-19
| | | | | | | | This applies to every library where performance is not critical.
* | avformat/avidec: also print frame_num in debug outputMichael Niedermayer2015-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00'Michael Niedermayer2015-03-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4326bc364b58e97fc3d89417054a6b7610179a00': lavf: Do not list mov-only codecs in riff tags Conflicts: libavformat/Makefile libavformat/avidec.c See: 2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Do not list mov-only codecs in riff tagsCarl Eugen Hoyos2015-03-17
| | | | | | | | | | | | | | Instead check for all mov code-points when demuxing avi and print a warning if a video codec is found like this. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/avidec: cleanup includezhaoxiu.zeng2015-03-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: use avpriv_find_start_code in avi_read_packet()zhaoxiu.zeng2015-03-15
| | | | | | | | | | Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Do not list mov-only codecs in riff.c.Carl Eugen Hoyos2015-03-13
| | | | | | | | | | | | Instead check for all mov code-points when demuxing avi and print a warning if a video codec is found like this. Fixes a regression similar to the one described in ticket #4307.
* | avformat/avidec: Check avio_read() return before using the results for meta-dataMichael Niedermayer2015-03-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: initialize header arrayMichael Niedermayer2015-03-05
| | | | | | | | | | | | Fixes use of uninitialized memory in case read fails 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: Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
* | Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit 'f771b3ab5d3c0b763ee356152be550f4121babd0': avidec: do not export stream_codec_tag Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: do not export stream_codec_tagAnton Khirnov2015-01-27
| | | | | | | | Handle its only existing use case internally.
| * Allow reading of growing avi files (currently being written)Joakim Plate2014-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | This uses the RIFF header stored size to figure out the expected AVI file size, instead of the actual file. To work fully it requires handling failed avio_seek() instead of assuming they always succeed. Some fate file has been cut off and contains half a frame at the end which previously was not output during demuxing. This frame is now output to encoder, thus the fate diff update. Bug-Id: 261 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/avidec: optimize probeMichael Niedermayer2014-12-23
| | | | | | | | | | | | about 2x as fast Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wavdec: RIFX file format supportThomas Volkert2014-12-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Do not fail for crazy start timesGabor Nagy2014-12-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Increase dshow_block_align use threshold by 1Gabor Nagy2014-12-10
| | | | | | | | | | | | Fixes 00.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: fix handling dv in aviMichael Niedermayer2014-11-21
| | | | | | | | | | | | Fixes Ticket4086 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Add and use ff_copy_whitelists()Michael Niedermayer2014-10-24
| | | | | | | | | | | | | | Fixes potential security issue in case of running out of memory Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Forward whitelists to the subtitle demuxerMichael Niedermayer2014-10-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/avidec: Make unchanged function arguments constMichael Niedermayer2014-09-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: ensure that palette does not contain the BottomUp info.Benoit Fouet2014-09-22
| | | | | | | | | | | | | | | | | | Considering the palette is located at the end of extradata may be flawed when the extradata contains the palette followed by the BottomUp field. When the BottomUp field is present, exclude it from the palette. Fixes part of ticket #1304 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/avidec: allow rounding errors between scale/rate and timebaseMichael Niedermayer2014-06-04
| | | | | | | | | | | | Fixes Ticket3670 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: set average frame rate from headerMichael Niedermayer2014-05-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix dont and doesnt typosMichael Niedermayer2014-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix skiping typosMichael Niedermayer2014-04-27
| | | | | | | | | | Found-by: Alessandro Ghedini <alessandro@ghedini.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: skip len=0 entries from the indexDon Moir2014-04-25
| | | | | | | | | | | | | | Reduces cpu & memory requirements for the index See Ticket 3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Speed up keyframe detection codeMichael Niedermayer2014-04-22
| | | | | | | | | | | | Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by ↵Thilo Borgmann2014-04-05
| | | | | | | | | | | | Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: remove unused variablesMichael Niedermayer2014-04-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e': avi: Improve non-interleaved detection Conflicts: libavformat/avidec.c See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: Improve non-interleaved detectionMichael Niedermayer2014-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>. Check the index for streams with a time drift of 2s or a buffer drift of 64MB. Bug-Id: 666 CC: libav-stable@libav.org Sample-Id: yet-another-broken-interleaved-avi.avi Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | * commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add supported extension to avi and mov demuxersMarc-Antoine Arnaud2014-04-02
| |
* | 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>
| * lavf: more correct printf format specifiersDiego Biurrun2014-03-11
| |
* | avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()Michael Niedermayer2014-03-11
| | | | | | | | | | | | Fixes Ticket3421 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: calculate missing bitrates from indexMichael Niedermayer2014-03-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()Michael Niedermayer2014-03-02
| | | | | | | | | | | | | | Fixes out of array read Fixes: 0ff9841c2a102f06e0d582bfc3376cbd-asan_heap-oob_495589_6836_cov_1763916974_mewmew_ssa.avi 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-26 05:55:42 +0000