generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
60,998 Commits 24 Branches 241 Tags 173 MiB
983c7f4015
Commit Graph

60998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
38a08e0aea Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavd: add list devices API
  lavd/opengl_enc_shaders: fix gray* shader

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:18:44 +01:00
Nicholas Robbins
b02b783417 MAINTAINERS: add myself as vf_dejudder.c maintainer 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:13:55 +01:00
Peter Ross
a707d18a48 avcodec/vp8dsp: zeroise input coefficient array after use in vp7 idct functions 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:12:34 +01:00
Michael Niedermayer
c97c7c2adf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Fix project name typo

Merge for metadata only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 02:47:20 +01:00
Michael Niedermayer
1fc74926a5 Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples

Conflicts:
	configure
	doc/Makefile
	doc/doxy-wrapper.sh
	doc/examples/avcodec.c
	doc/examples/decoding_encoding.c
	doc/examples/metadata.c
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
	libavcodec/Makefile
	libavcodec/api-example.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 02:22:01 +01:00
Michael Niedermayer
91253839e1 avcodec/h264: more completely check the loop filter parameters 
Fixes out of array read
Fixes: caa65cc01655505705129b677189f036-signal_sigsegv_fdcc43_2681_cov_3043376737_PPH422I5_Panasonic_A.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 01:29:34 +01:00
Vittorio Giovara
614b9e4db8 h264: use avpriv_request_sample for chroma_format_idc 2014-02-16 23:51:44 +01:00
Michael Niedermayer
c919e1ca2e avcodec/msrle: use av_image_get_linesize() to calculate the linesize 
Fixes out of array access
Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 23:20:57 +01:00
Alexander Strasser
2218fbe05e doc/APIchanges: Update for new function avio_find_protocol_name 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2014-02-16 22:49:43 +01:00
Alexander Strasser
2b17c7685f ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs 
Currently the file overwrite check does not work for paths that
contain a colon.

Use avio_find_protocol to always execute the existence check if
the file protocol is going to be used.

Fix remaining part of ticket #3249.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2014-02-16 22:34:21 +01:00
Alexander Strasser
db3c9701f4 lavf/avio: Introduce avio_find_protocol_name 
Make it possible to find out what protocol will be chosen
for a given URL.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2014-02-16 22:34:21 +01:00
Diego Biurrun
f53e274f4c doc: Fix project name typo 2014-02-16 22:08:21 +01:00
Diego Biurrun
b339182eba Move all example programs to doc/examples 
Also drop support for building examples in library directories.
 2014-02-16 21:37:21 +01:00
Michael Niedermayer
a392bf6570 avcodec/dxtory: fix src size checks 
Fixes integer overflow
Fixes out of array read
Fixes: d104661bb59b202df7671fb19a00ca6c-asan_heap-oob_d6429d_5066_cov_1729501105_dxtory_mic.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 21:13:02 +01:00
Michael Niedermayer
573a8ce8f9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  g2meet: validate bpp and bitmasks in the display info

Conflicts:
	libavcodec/g2meet.c

See: ae95b2f810
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 20:39:14 +01:00
Lukasz Marek
81c3f81d6f lavd: add list devices API 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-02-16 20:07:08 +01:00
Lukasz Marek
d3cf9b24cf lavd/opengl_enc_shaders: fix gray* shader 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-02-16 19:56:53 +01:00
Michael Niedermayer
05e9e3342f avformat/mov: fix avg_frame_rate calculation 
Fixes integer overflow
Fixes Ticket3390

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 19:05:49 +01:00
Nicholas Robbins
b4d308c04f lavfi: adding dejudder filter to remove judder produced by partially telecined material. 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 17:43:58 +01:00
Maxim Poliakovski
77fbc03265 g2meet: validate bpp and bitmasks in the display info 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-02-16 16:32:53 +01:00
Michael Niedermayer
18f94df8af avcodec/alsdec: check predictor order against block length 
Fixes out of array access
Fixes: abd3c041acbcb816be113455d138166b-asan_heap-oob_b11634_3707_cov_1707137151_als_05_2ch48k16b.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 13:13:34 +01:00
James Almer
ec482e738d x86/fladsp: add missing check to ff_flacdsp_init_x86() 
Fixes compilation with flac decoder disabled and encoder enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 12:06:04 +01:00
Timothy Gu
8fe1076094 doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY 
These charts in man page are currently destroyed.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 03:10:38 +01:00
Hendrik Leppkes
45581ed15d oggdec/vorbis: fix stream duration condition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 02:30:54 +01:00
Michael Niedermayer
bbd8fd0371 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Prepare for 10_beta1 Release

Conflicts:
	RELEASE

merge only for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 02:24:52 +01:00
Michael Niedermayer
1db87da351 Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c' 
* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 02:18:58 +01:00
Michael Niedermayer
a2bc6c116d Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c' 
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 02:05:29 +01:00
Michael Niedermayer
fdf8b59b28 Merge commit '9c0e4b3395cad79c560d03d2a94595d89e017885' 
* commit '9c0e4b3395cad79c560d03d2a94595d89e017885':
  ac3: update AC3PreferredStereoDownmixMode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 01:56:31 +01:00
Michael Niedermayer
e5c7229999 avcodec/utils: set AVFrame format unconditional 
Fixes inconsistency and out of array accesses
Fixes: 10cdd7e63e7f66e3e66273939e0863dd-asan_heap-oob_1a4ff32_7078_cov_4056274555_mov_h264_aac__mp4box_frag.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 01:34:35 +01:00
Michael Niedermayer
d1e6602665 avcodec/hevc: make *ps_id unsigned 
Fixes integer overflow
Fixes out of array accesses
Fixes 2f65e7dbd02a12f426a423bd7bf880b4-signal_sigsegv_127c952_2793_cov_2517424539_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 23:27:20 +01:00
Michael Niedermayer
bf2ce19e51 avcodec/hevc: Dont turn 32bit timebases into negative numbers 
Fixes assertion failure
Fixes: 499f6ecaeae8e3f79a115a72c61ffd15-asan_static-oob_124a175_2792_cov_1782273879_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 23:17:53 +01:00
Reinhard Tartler
f58dcfb32e Prepare for 10_beta1 Release 2014-02-15 16:49:04 -05:00
Michael Niedermayer
b818637b84 avcodec/hevc_ps: Use get_bits_long() in decode_vui() 
Fix assertion failure
Fixes: a225222ef88a0f5b1e93e1d0432debc3-asan_static-oob_124a17d_1448_cov_77608227_DBLK_E_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 22:30:40 +01:00
Tim Walker
9cd4bc4176 ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data. 2014-02-15 22:25:00 +01:00
Tim Walker
c98f3169bf lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type. 2014-02-15 22:24:53 +01:00
Tim Walker
9c0e4b3395 ac3: update AC3PreferredStereoDownmixMode. 
'11b' is reserved in the A/52 specification,
but newer encoders use it to indicate a Dolby
Pro Logic II compatible Lt/Rt downmix.
 2014-02-15 22:24:48 +01:00
Michael Niedermayer
f3a862935d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264_parser: use enum values in h264_find_frame_end()

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 21:05:31 +01:00
James Darnley
91126dc481 flacdsp_lpc_template: add comment to explain the CONFIG_SMALL code 
I found the optimisation of 2 samples per iteration obscured the
underlying algorithm.  I had to write it out on paper and translate into
a mathematical sum to see that the two samples are unconnected.  I hope
that if anyone else is struggling to understand the code that this will
be useful.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 20:48:25 +01:00
Christophe Gisquet
9ae8e23188 dcadsp: scan coefficients linearly instead. 
This change is inspired by x86 asm, where this frees a register.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 20:08:08 +01:00
Christophe Gisquet
5a48caa34b dca: replace some memcpy by AV_COPY128 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 19:03:10 +01:00
Christophe Gisquet
133b34207c x86: float dsp: unroll SSE versions 
vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.

Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 18:54:21 +01:00
Vittorio Giovara
dc971acf4a h264_parser: use enum values in h264_find_frame_end() 2014-02-15 18:29:49 +01:00
Michael Niedermayer
1db8bc5648 avcodec/fic: clear slice_data 
Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 17:19:59 +01:00
Michael Niedermayer
d46ef40129 avcodec/fic: fix slice checks 
fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 17:19:32 +01:00
Michael Niedermayer
ed1a687856 avcodec/lossless_videodsp: add_hfyu_left_prediction_int16_c: fix harmless integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 16:51:33 +01:00
Michael Niedermayer
042ab7c49e doc/doxy-wrapper.sh: fix execute flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 16:51:06 +01:00
Michael Niedermayer
3c7220fc60 avcodec/frame_thread_encoder: warn about huffyuv limitations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 15:16:51 +01:00
Michael Niedermayer
f7459bcfc5 avcodec/frame_thread_encoder: restructure huffyuv checks 
This makes them similar to the other checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 15:14:46 +01:00
Michael Niedermayer
59279bf21f avcodec/huffyuvenc: only allocate stats_out when it will be used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 15:06:29 +01:00
Lukasz Marek
776cda748d lavc/motion_est: remove unused variable 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 13:07:54 +01:00