wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
68431 commits 40 branches 405 tags 230 MiB
Commit graph

30614 commits

Author SHA1 Message Date
Michael Niedermayer
27f2e211aa Merge commit '559fa0d41b' 
* commit '559fa0d41b':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:23:53 +01:00
Michael Niedermayer
3f679f73a2 Merge commit '8502c1e9ff' 
* commit '8502c1e9ff':
  vdpau: add mapping for H.264 Extended profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:14:58 +01:00
Michael Niedermayer
0b30d186f1 Merge commit '8b51bcfed7' 
* commit '8b51bcfed7':
  vdpau: revector macro to reduce line span

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 22:07:41 +01:00
Rémi Denis-Courmont
559fa0d41b vdpau: add mapping for H.264 Constrained Baseline profile and fallback 
Old VDPAU drivers do not support this newly defined profile, so falling
back to Main profile is necessary for backward binary compatibility.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:30:03 +01:00
Rémi Denis-Courmont
8502c1e9ff vdpau: add mapping for H.264 Extended profile 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:29:27 +01:00
Rémi Denis-Courmont
8b51bcfed7 vdpau: revector macro to reduce line span 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-12-14 18:29:07 +01:00
Michael Niedermayer
ad2deb02e5 avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers() 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-14 14:30:45 +01:00
Clément Bœsch
d823edee8d avcodec: fix wording in AVSubtitleRect doxy 2014-12-13 23:35:22 +01:00
Michael Niedermayer
5d0cfb58ef avcodec/dvdsubdec: Avoid strerror() due to thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 15:15:07 +01:00
Michael Niedermayer
3ab82e9206 avcodec/libxvid_rc: Avoid strerror() for thread saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 15:12:37 +01:00
wm4
ce35a61399 lavc/avpacket: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-12 19:31:29 +01:00
Michael Niedermayer
f96fcba1e3 avcodec/libutvideoenc: Check avpicture_get_size() return code 
Fixes CID1257656

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 17:14:15 +01:00
Michael Niedermayer
086e29a011 avcodec/libutvideoenc: fix leak of info array on error 
Fixes CID1257657

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 17:13:49 +01:00
Michael Niedermayer
27dfe54eb7 avcodec/libxavs: fix division by 0 bitrate 
Fixes CID1257655

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 13:25:10 +01:00
Michael Niedermayer
a03f72e744 avcodec/x86/hevc_mc: fix sse register counts 
These fix failures of --enable-xmm-clobber-test
It would be better to change the code to use fewer registers, but until
someone does the used register count must not be too small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 13:17:26 +01:00
Michael Niedermayer
ef23bd939d avcodec/hevc: Silence "warning: ref0/1 may be used uninitialized in this function" 
Also make code more robust by initializing the pointers to NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 04:17:43 +01:00
Michael Niedermayer
66daf3b811 Merge commit 'c7921a4804' 
* commit 'c7921a4804':
  libfdk-aacdec: Fix a boundary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 01:46:11 +01:00
Timo Rothenpieler
2a428db5e2 avcodec: Add NVENC encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-11 01:06:27 +01:00
Martin Storsjö
c7921a4804 libfdk-aacdec: Fix a boundary check 
This avoids potential out of bounds writes, with potential future
versions of the library.

Bug-Id: CID 1254945
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-10 22:51:42 +02:00
Michael Niedermayer
ae93965359 avcodec/hevc_refs: fix potential use of uninitialized min_idx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 14:46:39 +01:00
Michael Niedermayer
d43d5c5707 avcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 07:34:49 +01:00
Michael Niedermayer
cb416a7d79 Merge commit '4c81613df4' 
* commit '4c81613df4':
  arm: mlpdsp: handle pic offset calculation in a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 00:51:26 +01:00
Michael Niedermayer
824932dc47 Merge commit '581c7f0e12' 
* commit '581c7f0e12':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 00:39:00 +01:00
Janne Grunau
4c81613df4 arm: mlpdsp: handle pic offset calculation in a macro 
Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.
 2014-12-09 22:00:08 +01:00
Janne Grunau
581c7f0e12 arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent 
No significant difference in used cpu cycles on a cortex-a9.
 2014-12-09 22:00:08 +01:00
Michael Niedermayer
92d47e2aa3 Merge commit '780cd20b00' 
* commit '780cd20b00':
  aarch64: Use .data.rel.ro for const data with relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 12:08:29 +01:00
Michael Niedermayer
16e65419ed Merge commit 'f963f80399' 
* commit 'f963f80399':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 11:58:13 +01:00
Martin Storsjö
780cd20b00 aarch64: Use .data.rel.ro for const data with relocations 
This reverts commit c00365b46d
in addition to using a different section.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 11:43:31 +02:00
Martin Storsjö
f963f80399 arm: Use .data.rel.ro for const data with relocations 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 11:43:25 +02:00
Lukasz Marek
72732307d9 lavc/options: add test for avcodec_copy_context 
This test doesn't cover every possible issue with this function.
It covers options management only.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-08 23:14:29 +01:00
Michael Niedermayer
74622ad320 Merge commit '6fd91fa119' 
* commit '6fd91fa119':
  h264: increase MAX_SLICES to 32

The available sample decodes correctly before, but the reporter of the bug
claims that this change reduces artifacts. This is thus merged
If someone has samples that decode differently depending in the MAX_SLICES
value, please open a ticket on trac.
Also this change should be reverted if it turns out that the artifacts
that where seen had a different cause

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 21:48:36 +01:00
Michael Niedermayer
82a60de3b7 avcodec/pngdec: handle 4 more bytes with SIMD for RGB64 in paeth prediction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 18:24:58 +01:00
Michael Niedermayer
ed9be7dd47 avcodec/x86/pngdsp: fix off by 1 error 
This fixes artifacts in the last pixel of rows with some widths and pixel formats

Found-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Tested-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 18:24:40 +01:00
Rong Yan
9bd8f2cc32 avcodec/ppc/vp3dsp_altivec: POWER LE support to vp3_idct_add_altivec() 
add GET_VDST16() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 15:19:12 +01:00
Vittorio Giovara
6fd91fa119 h264: increase MAX_SLICES to 32 
H264 streams from CounterPath Bria and some Cisco phones need an
increased pool for correct decoding.

Bug-Id: 645
Sample-Id: bria-h264.mka
 2014-12-08 13:30:38 +00:00
Zoltan Kovacs
4843a9c74f dpx: always write the image offset 
According to the DPX file format description found at
http://www.fileformat.info/format/dpx/egff.htm the ImageElement part of
the GenericImageHeader also contains an an offset to the real image data
beside the same member that can be found in the GenericFileHeader.

Libav keeps this member empty (=0) while some applications expects it to
be filled properly. FATE test updated accordingly.

Bug-Id: 742
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-12-08 13:29:18 +00:00
Michael Niedermayer
5054d2a92b Merge commit 'b280c6202b' 
* commit 'b280c6202b':
  arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 12:42:47 +01:00
Michael Niedermayer
8554a10992 Merge commit 'ae81576414' 
* commit 'ae81576414':
  arm: fft_vfp: Add a missing "endconst" when building in thumb mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 12:31:33 +01:00
Martin Storsjö
b280c6202b arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb 
Don't include the function pointer table in the code segment
in arm mode.

This shouldn't have any significant performance effect. It does
end up as a few more instructions than before, for ARM, but
only at the entry to this function, not within the fft functions
themselves.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-08 12:29:53 +02:00
Martin Storsjö
ae81576414 arm: fft_vfp: Add a missing "endconst" when building in thumb mode 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-08 12:29:49 +02:00
Benoit Fouet
4fa2758c79 avcodec/pngdec: check av_image_get_linesize return value 
Fixes CID 1257012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 04:58:00 +01:00
Michael Niedermayer
df6cdb23f0 avcodec/utils: Check AVFrame width/height in avcodec_encode_video2() 
This is similar to the format check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-07 17:47:44 +01:00
Clément Bœsch
6153aa2d1e avcodec/jacosubdec: check strftime return value 
Fixes CID1257004
 2014-12-07 15:46:17 +01:00
Michael Niedermayer
3393cd8545 avcodec/utils: check AVframe.format being set in avcodec_encode_video2() 
We dont fail hard if its not set as the old API allowed this and our examples
did in the distant past not set it, these examples still work with the
current code and some encoders.

Based on suggestion by: funman
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-07 02:44:14 +01:00
Michael Niedermayer
6be36ef3c1 avcodec/libxavs: disable global header code 
This code only segfaults and fixing the segfault, the resulting
files are unplayable, so disable to avoid the segfault.

Better solution is welcome

See: [FFmpeg-devel] [PATCH] avcodec/libxavs: remove global header code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 19:02:32 +01:00
Michael Niedermayer
1adc1b97e1 avcodec/hevc_ps: Add context to av_log() call 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 15:30:41 +01:00
Michael Niedermayer
ce800d4695 avcodec/dvbsubdec: Remove redundant "DVBSub error" prefix 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 02:03:08 +01:00
Michael Niedermayer
1d048f762d Merge commit '9a738c27dc' 
* commit '9a738c27dc':
  v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Conflicts:
	libavcodec/v210enc.c
	libavcodec/v210enc.h
	libavcodec/x86/Makefile
	libavcodec/x86/v210enc.asm
	libavcodec/x86/v210enc_init.c
	tests/ref/vsynth/vsynth1-v210
	tests/ref/vsynth/vsynth2-v210

See: 36091742d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 01:54:10 +01:00
Lukasz Marek
8616c5b75a lavc/options: fix leaks in avcodec_copy_context 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-12-06 01:01:15 +01:00
Michael Niedermayer
66f379da15 Merge commit 'b72727a524' 
* commit 'b72727a524':
  lavc: mention that the parser callback never returns an error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 00:52:42 +01:00