generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,635 Commits 24 Branches 241 Tags 173 MiB
bd27dc9102
Commit Graph

73635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
7755a57440 Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856' 
* commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856':
  asfdec: prevent possible memory leak in the asf_read_metadata_obj

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 03:51:00 +02:00
Michael Niedermayer
a8ab64d2f7 Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec' 
* commit '910247f1720c6aae422723c05dac6d0b19f20bec':
  lavc: Deprecate avctx.{inter,intra}_quant_bias

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 03:40:22 +02:00
Michael Niedermayer
e15e78f391 Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89' 
* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
  lavu: add an API function to return the Libav version string

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	doc/APIchanges
	libavutil/avutil.h
	libavutil/utils.c

See: f91126643a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-03 03:22:48 +02:00
Luca Barbato
80f955c908 vda: Check the correct pointer for buffer allocation 
CC: libav-stable@libav.org
Found-By: kropping
 2015-07-03 01:58:32 +02:00
Andreas Cadhalpun
76d4c62734 webp: Make sure enough bytes are available 
Every chunk needs at least 8 bytes for chunk_type and chunk_size.
Prevent a possible infinite loop.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-03 01:50:09 +02:00
Alexandra Hájková
016cac75c6 asfdec: prevent the infinite loop in detect unknown_subobject 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-03 01:50:09 +02:00
Alexandra Hájková
9752d2e6cc asfdec: prevent possible memory leak in the asf_read_metadata_obj 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-03 01:50:09 +02:00
Vittorio Giovara
910247f172 lavc: Deprecate avctx.{inter,intra}_quant_bias 
They are used by dnxhd and mpegvideo_enc exclusively, move them to codec
private options instead.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-02 22:37:59 +01:00
wm4
1316df7aa9 lavu: add an API function to return the Libav version string 
This returns something like "v12_dev0-1332-g333a27c". This is much more
useful than the individual library versions, of which there are too
many, and which are very hard to map back to releases or git commits.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2015-07-02 23:22:53 +02:00
Paul B Mahol
2778fdbe54 swscale: implement YA8 output 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-02 17:36:05 +00:00
Andreas Cadhalpun
d0eff8857c wavpack: limit extra_bits to 32 and use get_bits_long 
More than 32 bits can't be stored in an integer and get_bits should not
be used with more than 25 bits.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-07-02 23:31:16 +02:00
Paul B Mahol
96953e2ef6 avfilter/vf_mpdecimate: remove packed formats 
Packed formats are not supported.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-02 15:36:00 +00:00
Paul B Mahol
7ff5a345a4 avfilter: use AVFILTER_DEFINE_CLASS() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-02 15:36:00 +00:00
Ivan Uskov
6e5864ab29 avcodec/qsvenc_h264: Change the set of performance presets to match with the MFX library constants. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 19:16:41 +02:00
Michael Niedermayer
c9220d5b06 avcodec/mjpegdec: Reorder operations to avoid undefined behavior 
Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 18:53:32 +02:00
Michael Niedermayer
9dc0bac971 avcodec/motion_est_template: Fix undefined shifts in CHECK_MV() 
Fixes:asan_heap-oob_4d5bb0_2295_cov_3374722539_hotel_california_ra5.1_640x480_30s.rmvb

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 18:43:03 +02:00
Ivan Uskov
db89f45535 avcodec/qsv: Extending QSV/MFX session initialization for the linux platform where a display handle is required. 
Now ff_qsv_init_internal_session() is able
to find appropriate display handle under linux using VAAPI.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 15:05:56 +02:00
Stefano Sabatini
8cbce1001d doc/muxers/segment: fix formatting of segment_list_type option 
Place @item entry at the right point, remove duplicated description.
 2015-07-02 11:06:23 +02:00
Michael Niedermayer
1f69b7baa1 avformat/asfdec_f: Fix memleak 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 09:42:33 +02:00
John Adlum
72cad80016 avformat/asfdec_f: Add ASFDataType, use named types for metadata 
This is based on asfdec_o.c, but uses a proper type instead of defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:58:27 +02:00
John Adlum
59fffefdb4 avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed size buffer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:58:23 +02:00
John Adlum
c8eca438a9 avformat/asfdec_f: factor error checking out of main header parsing loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:58:18 +02:00
rogerdpack
a1c03b9d58 ffmpeg_filter: log more information on failure to init simple filter graph 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 04:56:10 +02:00
Michael Niedermayer
03b2b40fd7 Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de' 
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
  fate-g2m3: disable the audio stream

Conflicts:
	tests/ref/fate/g2m3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-02 00:34:24 +02:00
Michael Niedermayer
838c5f3df7 avformat/utils: Redesign scoring in av_find_default_stream_index() 
This avoids empty streams from being selected if a equivalent non empty one is available
The new system is also clearer and more systematic
This may need finetuning, which should be easy to do ...

Fixes Ticket2687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 22:51:48 +02:00
Michael Niedermayer
52c5521877 ffmpeg_opt: Favor streams that had packets 
Fixes Thailand-Wave.wmv without explicitly specifying a stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 22:43:26 +02:00
Paul B Mahol
5165c600eb avformat/rtmpproto: increase hardcoded url/path lengths 
Fixes #4103.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 20:03:26 +00:00
Janne Grunau
a31c4b2cbe fate-g2m3: disable the audio stream 
The audio decoder is not in fate-g2m3 dependencies and the wma2 decoder
is probably not bit-exact since it it float based.
 2015-07-01 21:42:48 +02:00
Rodger Combs
c190fdf65d lavu: Makefile: skip atomic.c if native atomics are available 
This prevents a linker warning and skips a useless compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 21:40:16 +02:00
Michael Niedermayer
06a0d5ef5c avcodec/h264dsp_template: Fix undefined shifts 
Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 20:39:25 +02:00
Michael Niedermayer
ce81e47c91 avcodec/mss2: Fix integer overflow 
This also simplifies the code
Fixes: signal_sigabrt_7ffff6ac8cc9_2943_cov_3588637614_mss2_speech.wmv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 20:30:48 +02:00
Michael Niedermayer
f8e038f9a0 Merge commit '4e0819310e2d2eff60be2d6df28335f0739712b9' 
* commit '4e0819310e2d2eff60be2d6df28335f0739712b9':
  elsdec: Replace EOVERFLOW with INVALIDDATA

See: dec728888f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 19:53:59 +02:00
Michael Niedermayer
5142963b7d Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721' 
* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
  g2meet: force simple idct for identical results over all fate configs

Conflicts:
	tests/ref/fate/g2m3
	tests/ref/fate/g2m4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 19:31:34 +02:00
Paul B Mahol
17e6d7b400 avfilter/vf_extractplanes: use faster path for input formats with only one component 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 17:19:52 +00:00
Paul B Mahol
fc40cdbf49 avfilter/vf_extractplanes: rename misleading variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 17:19:52 +00:00
Paul B Mahol
be35b8b9a9 avfilter/vf_extractplanes: support more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-01 17:19:52 +00:00
Michael Niedermayer
6205143bb3 Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a' 
* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
  g2meet: use av_ceil_log2 instead of a custom function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 19:09:55 +02:00
Michael Niedermayer
92c858ae66 Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75' 
* commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75':
  g2meet: use an unsigned type for the djb hash

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 19:09:10 +02:00
Michael Niedermayer
9cf95654ac Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a' 
* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
  avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()

Conflicts:
	libavcodec/atrac3plusdec.c
	libavcodec/sp5xdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:58:01 +02:00
John Adlum
811008b8ee avformat/asfdec_f: Assert that packet positions match in asf_read_pts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:47:59 +02:00
John Adlum
28206b75e8 avformat/asfdec_f: Correct skip to key code 
Fixes Ticket3978

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:47:54 +02:00
John Adlum
089a818bd3 avcodec/pthread_frame: Correcting typo of "occurred" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 18:47:44 +02:00
Shivraj Patil
2eb28e889d avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions 
This patch adds MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions in new file mpegvideo_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 17:32:47 +02:00
Michael Niedermayer
4e0819310e elsdec: Replace EOVERFLOW with INVALIDDATA 
EOVERFLOW is not available on all platforms.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 16:26:42 +01:00
Michael Niedermayer
53fd70579b avcodec/h264_mvpred: Fix undefined shifts in MAP_F2F 
Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 15:53:15 +02:00
Michael Niedermayer
ac78014f0b avcodec/motion_est: Fix some undefined shifts 
Fixes: asan_heap-oob_1dd60fd_1049_cov_4200102444_P4250048.MOV

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 15:42:07 +02:00
Janne Grunau
f91fe24e9b g2meet: force simple idct for identical results over all fate configs 2015-07-01 15:33:20 +02:00
wm4
f91126643a lavu: add an API function to return the FFmpeg version string 
This returns something like "N-73264-gb54ac84". This is much more useful
than the individual library versions, of which there are too much and
which are very hard to map back to releases or git commits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 14:58:05 +02:00
Vadim Belov
db64af6395 avformat/concatdec: copy stream metadata when using concat 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 14:43:31 +02:00
Michael Niedermayer
60ec3007e6 avformat/nutdec: Check ff_gen_search() for failure 
Fixes assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-01 14:28:41 +02:00