RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
73,470 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

466 Commits

Author SHA1 Message Date
Michael Niedermayer 488383afd1 avformat/avidec: add mp2 to the list of exceptions instead of generally treating dshow_block_align==1 special 
Fixes Ticket4552

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-17 01:46:09 +02:00
Michael Niedermayer 73b8155b31 Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81' 
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
  avi: Validate sample_size

Conflicts:
	libavformat/avidec.c

See: ca234639ac
See: c7369f3a4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:20:37 +02:00
Andreas Cadhalpun 4d0ee4962b avi: Validate sample_size 
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>
 2015-05-09 15:51:31 +02:00
Michael Niedermayer c7369f3a4b avformat/avidec: print a warning for negative sample_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-05 00:04:38 +02:00
Andreas Cadhalpun ca234639ac avidec: avoid infinite loop due to negative ast->sample_size 
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>
 2015-05-05 00:04:38 +02:00
Andreas Cadhalpun 0eec40b713 avidec: check for valid bit_rate range 
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>
 2015-05-04 21:11:19 +02:00
Michael Niedermayer 8a91ee7837 avformat/avidec: Do not call av_log() per byte, use ff_tlog() 
This was av_dlog() previously and should not have been changed to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 16:21:42 +02:00
Michael Niedermayer 40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* 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>
 2015-04-20 03:19:47 +02:00
Vittorio Giovara 1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Michael Niedermayer 81a6b075bd avformat/avidec: also print frame_num in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-19 16:36:29 +01:00
Michael Niedermayer 07ca090e81 Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00' 
* commit '4326bc364b58e97fc3d89417054a6b7610179a00':
  lavf: Do not list mov-only codecs in riff tags

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c

See: 2e0b5f5c90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 21:09:43 +01:00
Carl Eugen Hoyos 4326bc364b lavf: Do not list mov-only codecs in riff tags 
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>
 2015-03-17 13:34:22 +00:00
zhaoxiu.zeng 213ddcb029 avformat/avidec: cleanup include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:03:26 +01:00
zhaoxiu.zeng bf696e265a avformat/avidec: use avpriv_find_start_code in avi_read_packet() 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:02:57 +01:00
Carl Eugen Hoyos 2e0b5f5c90 lavf: Do not list mov-only codecs in riff.c. 
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.
 2015-03-13 08:49:03 +01:00
Michael Niedermayer 8c013a9e55 avformat/avidec: Check avio_read() return before using the results for meta-data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-05 19:38:20 +01:00
Michael Niedermayer 8a048fe6f8 avformat/avidec: initialize header array 
Fixes use of uninitialized memory in case read fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-05 18:41:03 +01:00
Michael Niedermayer a0fe1a25fa Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e' 
* 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>
 2015-02-14 21:07:40 +01:00
Diego Biurrun daf8cf358a avformat: Don't anonymously typedef structs 2015-02-14 10:13:47 -08:00
Michael Niedermayer be023405a7 Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0' 
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
  avidec: do not export stream_codec_tag

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 16:17:42 +01:00
Anton Khirnov f771b3ab5d avidec: do not export stream_codec_tag 
Handle its only existing use case internally.
 2015-01-27 09:13:45 +01:00
Michael Niedermayer 0d7a14e236 avformat/avidec: optimize probe 
about 2x as fast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-23 16:32:26 +01:00
Thomas Volkert 00d7555f34 wavdec: RIFX file format support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-18 00:10:35 +01:00
Michael Niedermayer 51b193214d avformat/avidec: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 15:43:14 +01:00
Gabor Nagy 28fc31d78d avformat/avidec: Do not fail for crazy start times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 14:59:10 +01:00
Gabor Nagy ae8168074e avformat/avidec: Increase dshow_block_align use threshold by 1 
Fixes 00.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 03:18:30 +01:00
Joakim Plate 90411b333d Allow reading of growing avi files (currently being written) 
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>
 2014-12-08 13:29:33 +00:00
Michael Niedermayer f0ae0354d3 avformat/avidec: fix handling dv in avi 
Fixes Ticket4086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 03:34:13 +01:00
Michael Niedermayer 4641ae352e avformat: Add and use ff_copy_whitelists() 
Fixes potential security issue in case of running out of memory

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 19:23:23 +02:00
Michael Niedermayer b76234c00c avformat/avidec: Forward whitelists to the subtitle demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-23 18:19:37 +02:00
Michael Niedermayer d6ed67780b libavformat/avidec: Make unchanged function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 18:33:55 +02:00
Benoit Fouet 9c843fb1d0 avformat/avidec: ensure that palette does not contain the BottomUp info. 
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>
 2014-09-22 11:01:27 +02:00
James Almer d34ec64a22 replace calls to url_feof() with avio_feof() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 00:48:38 +02:00
Michael Niedermayer 571ab8344a avformat/avidec: allow rounding errors between scale/rate and timebase 
Fixes Ticket3670

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-04 05:04:13 +02:00
Michael Niedermayer 91736025b2 avformat/avidec: set average frame rate from header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 05:40:00 +02:00
Michael Niedermayer 466988ab75 Fix dont and doesnt typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:14:32 +02:00
Michael Niedermayer e9ad121ba5 Fix skiping typos 
Found-by: Alessandro Ghedini <alessandro@ghedini.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:50:14 +02:00
Don Moir 62056d09b1 avformat/avidec: skip len=0 entries from the index 
Reduces cpu & memory requirements for the index
See Ticket 3531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 18:56:05 +02:00
Michael Niedermayer 57fb570908 avformat/avidec: Speed up keyframe detection code 
Fixes Ticket3531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 04:33:20 +02:00
Thilo Borgmann 2f08dad028 lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-05 03:32:06 +02:00
Michael Niedermayer cc8b45c0ce avformat/avidec: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-02 19:04:58 +02:00
Michael Niedermayer 91a0d3af65 Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e' 
* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e':
  avi: Improve non-interleaved detection

Conflicts:
	libavformat/avidec.c

See: 8df774be88 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-02 18:03:02 +02:00
Michael Niedermayer 9d599e3f6e avi: Improve non-interleaved detection 
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>
 2014-04-02 12:11:31 +02:00
Michael Niedermayer 61b3b3315c Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509' 
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
  lavf: add supported extension to avi and mov demuxers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-02 03:15:19 +02:00
Marc-Antoine Arnaud f1c4a54f6e lavf: add supported extension to avi and mov demuxers 2014-04-02 00:27:53 +02:00
Michael Niedermayer 28ee7757f5 Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 
* 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>
 2014-03-11 21:05:34 +01:00
Michael Niedermayer 5d75730c58 avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag() 
Fixes Ticket3421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 19:20:47 +01:00
Michael Niedermayer 01000064c9 avidec: calculate missing bitrates from index 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 19:20:47 +01:00
Diego Biurrun d92024f18f lavf: more correct printf format specifiers 2014-03-11 13:13:41 +01:00
Michael Niedermayer 52a2138656 avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub() 
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>
 2014-03-02 04:38:30 +01:00