generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,373 Commits 24 Branches 241 Tags 173 MiB
1306359ea9
Commit Graph

61373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul B Mahol
709746b6af avfilter/af_compand: do not leak frames on error 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-15 11:38:32 +00:00
Michael Niedermayer
d601106ab1 avcodec/x86/lossless_videodsp: fix w type 
Fixes fate issues on mingw64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 06:41:38 +01:00
Michael Niedermayer
baaa6d6785 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

Conflicts:
	libavfilter/buffersink.h
	libavfilter/buffersrc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 04:05:04 +01:00
Michael Niedermayer
efe4a06929 Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593' 
* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
  buffersink: document special error codes returned from av_buffersink_get_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 04:03:09 +01:00
Peter Ross
b8664c9294 avcodec/vp8dsp: add VP7 idct and loop filter 
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-15 02:15:35 +01:00
Lukasz Marek
a91d9e4b63 lavc/ffv1enc: add const to silent warning 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 01:50:47 +01:00
Lukasz Marek
ffe50a92a8 lavc/tiff_common: add const to silent warnings 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 01:50:41 +01:00
Peter Ross
c551431792 avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED 
Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 23:20:57 +01:00
Anton Khirnov
ba7dfe5c50 lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group 2014-02-14 22:02:39 +01:00
Anton Khirnov
f758ea6e99 buffersink: document special error codes returned from av_buffersink_get_frame 2014-02-14 22:02:25 +01:00
Michael Niedermayer
f11905763c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: reduce overreads when loading 8 pixels in altivec dsp functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 22:00:12 +01:00
Michael Niedermayer
e136579ca3 Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0' 
* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
  utvideoenc: Enable support for multiple slices and use them

Conflicts:
	libavcodec/utvideoenc.c
	tests/fate/utvideo.mak

See: efec857c9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 21:50:21 +01:00
Jan Ekström
efec857c9f utvideoenc: Enable support for multiple slices and use them 
The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 21:38:00 +01:00
Michael Niedermayer
92225877ce Merge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34' 
* commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34':
  libx265: Remove redundant default param call

See: 25bc8390bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 21:36:09 +01:00
Michael Niedermayer
374576d6ee Merge commit '41836c4e306e572ecf80d5a714aaec532c7ece60' 
* commit '41836c4e306e572ecf80d5a714aaec532c7ece60':
  libx265: Fix use of uninitialized input picture

See: 955544e4d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 21:29:51 +01:00
Michael Niedermayer
480af3a35c avformat/utils: skip the MPEG-2 style dts/pts code for HEVC 
This extends the exception from H264 to H264 + HEVC

Fixes Ticket3385

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 20:51:10 +01:00
Michael Niedermayer
68a959cb27 avcodec/utils: improve guess_correct_pts() by considerng mixed dts/pts use caused by NOPTSs 
No testcase known, this is a theoretical improvment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 20:42:13 +01:00
Janne Grunau
98fdfa9970 ppc: reduce overreads when loading 8 pixels in altivec dsp functions 
Altivec can only load naturally aligned vectors. To handle possibly
unaligned data a second vector is loaded from an offset of the original
location and the data is recovered through a vector permutation.
Overreads are minimal if the offset for second load points to the last
element of data. This is 7 for loading eight 8-bit pixels and overreads
are reduced from 16 bytes to 8 bytes if the pixels are 64-bit aligned.
For unaligned pixels the overread is reduced from 23 bytes to 15 bytes
in the worst case.
 2014-02-14 18:34:04 +01:00
Reynaldo H. Verdejo Pinochet
9ed876ac92 MAINTAINERS: add myself as ffserver maintainer 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-14 14:31:42 -03:00
Reynaldo H. Verdejo Pinochet
87079bd055 ffserver: merge RTSP's teardown & pause routines 
They were basically the same.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-14 14:31:42 -03:00
Reynaldo H. Verdejo Pinochet
720530e52a ffserver: cosmetics 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-14 14:31:41 -03:00
Reynaldo H. Verdejo Pinochet
35e525b732 ffserver: fix some comments 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-14 14:31:41 -03:00
Reynaldo H. Verdejo Pinochet
ba6186d6eb ffserver: factor out connection closing from handler 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-14 14:31:41 -03:00
Reynaldo H. Verdejo Pinochet
5df2a502f2 ffserver: avoid useless substitution 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-14 14:31:41 -03:00
Werner Robitza
1ffac25d31 doc/filters/histogram: copyedit for grammar 
There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.
 2014-02-14 15:11:46 +00:00