Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-14 03:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
72642 commits 38 branches 415 tags 290 MiB
Commit graph

72642 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shivraj Patil
88188f55a2 avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions 
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions (qpel as well as epel) in new file hevc_mc_biw_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 21:01:59 +02:00
Michael Niedermayer
1200289687 Merge commit '0289f81241' 
* commit '0289f81241':
  aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

Conflicts:
	libavcodec/aacdec.c

Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 19:23:34 +02:00
Michael Niedermayer
6034b4bb88 Merge commit '7f596368a4' 
* commit '7f596368a4':
  bink: Factorize bink put_pixel

Conflicts:
	libavcodec/bink.c

See: b3675f890a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 19:07:12 +02:00
Michael Niedermayer
ee08beb7d9 Merge commit 'e97446e600' 
* commit 'e97446e600':
  configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 18:52:05 +02:00
Michael Niedermayer
5116381511 Merge commit 'b9875b497a' 
* commit 'b9875b497a':
  configure: Remove unnecessary tests for d3d11va

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 18:41:02 +02:00
Michael Niedermayer
c08a64bb2b Merge commit '76eb0950b8' 
* commit '76eb0950b8':
  configure: Don't run "export $e" for an empty string

Conflicts:
	configure

See: d5db4a7c23
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 18:26:17 +02:00
Michael Niedermayer
cdc0087969 avutil/ppc/cpu: Our code assumes vsx implies altivec, thus assert this 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 18:23:59 +02:00
Michael Niedermayer
9614df4b15 avformat/mov: Retry same packet on IO failure to avoid loosing a packet 
Based on patch by: Zhang Rui <bbcallen@gmail.com>
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 17:37:09 +02:00
Stefano Sabatini
771537edcf ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow() 
This fixes compilation with latest MinGW, it does not seem to affect
MSYS2/MinGW-64.
 2015-06-03 16:25:08 +02:00
nu774
0289f81241 aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE 
The decoder assigns channels using default channel configuration
for 5.1ch when it parses an ADTS frame header using consecutive
channel ids.

When a PCE comes, it reassigns channels using PCE configuration
using directly the ids provided. They can be arbitrary.

Always use consecutive channel ids to avoid decoding glitches due
spurious reconfigurations due the channel ids mismatch between the
two otherwise-identical channel maps.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-03 14:40:10 +02:00
Paul B Mahol
b8c0cf7880 avfilter/vf_blend: add linearlight and glow mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-03 12:40:09 +00:00
Luca Barbato
7f596368a4 bink: Factorize bink put_pixel 
And make sure to check INTER_BLOCK as had been fixed by Michael
Niedermayer.

Reported-By: Andreas Cadhalpun
CC: libav-stable@libav.org
 2015-06-03 14:39:03 +02:00
Martin Storsjö
e97446e600 configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9 
Checking this struct is a bit more natural for this dependency.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-03 15:29:54 +03:00
Martin Storsjö
b9875b497a configure: Remove unnecessary tests for d3d11va 
These are only necessary once/if avconv gets support for this hwaccel.
While that obviously is desireable, we don't have it yet, and they
currently only are a distraction.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-03 15:28:25 +03:00
Martin Storsjö
76eb0950b8 configure: Don't run "export $e" for an empty string 
This fixes the side effect of printing the whole environment,
if no --env parameter was provided.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-03 15:27:42 +03:00
Shivraj Patil
ce1761db19 avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions 
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions (qpel as well as epel) in new file hevc_mc_uniw_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 13:46:47 +02:00
Michael Niedermayer
d7a762553c avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec 
This is the maximum rate possible based on the frame size limit of MXF D-10

Previous version reviewed by tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 12:12:34 +02:00
Ganesh Ajjanagadde
196b885a5f swresample/dither: check memory allocation 
check memory allocation in swri_get_dither()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 11:46:37 +02:00
Donny Yang
7495e728f5 avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB 
ARGB is not a supported PNG pixel format

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 01:42:57 +02:00
Michael Niedermayer
02915602d9 swresample: Check the return value of resampler->init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-03 01:05:19 +02:00
Michael Niedermayer
21e40f006a Merge commit '876d441fbe' 
* commit '876d441fbe':
  configure: don't enable tls protocols if network is disabled

Conflicts:
	configure

See: 7fc6545d5d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 22:50:19 +02:00
Andreas Cadhalpun
12a83bc0aa libopenjpegdec: register logging callback functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-02 22:43:58 +02:00
Andreas Cadhalpun
cb658d17b6 libopenjpegenc: use variable instead of type for sizeof 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-02 22:41:51 +02:00
Andreas Cadhalpun
1577526b47 libopenjpegenc: add NULL check for img before accessing it 
If opj_image_create fails to allocate an image it returns NULL, which
causes a segmentation fault at 'img->x0 = 0'.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-06-02 22:40:58 +02:00
Michael Niedermayer
b0af4043b9 configure: Remove now redundant vsx setting code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 22:14:41 +02:00
James Almer
876d441fbe configure: don't enable tls protocols if network is disabled 
This was a regression introduced with d8ffb2055f.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-02 22:48:50 +03:00
Paul B Mahol
3e04746ec3 avfilter/vf_blend: add hardmix mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-02 19:12:45 +00:00
Paul B Mahol
20cea0c7de avfilter/vf_blend: fix vividlight blend mode 
Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-02 18:55:24 +00:00
Paul B Mahol
ac973926b8 avfilter/vf_blend: clip result for divide blend mode 
Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-02 18:48:32 +00:00
Michael Niedermayer
d5db4a7c23 configure: Do not dump the whole environment to stdout 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 19:53:17 +02:00
Michael Niedermayer
2a33972030 Merge commit 'fd11465b21' 
* commit 'fd11465b21':
  configure: Use pkg-config for fdk-aac

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 19:31:22 +02:00
Michael Niedermayer
f939bf58b2 Merge commit '604abd025d' 
* commit '604abd025d':
  configure: Provide an option to override the environment

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 19:03:02 +02:00
Michael Niedermayer
cec3456254 Merge commit '06db45523c' 
* commit '06db45523c':
  configure: Support the extended pkgconf syntax

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 18:54:57 +02:00
Michael Niedermayer
ce4e57dbb5 avformat/sbgdec: Check alloc_array_elem() return value 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 16:42:33 +02:00
Michael Niedermayer
fccde16afa avcodec/flacenc: Simplify sizeof() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 15:41:44 +02:00
Michael Niedermayer
b70582e92f avcodec/proresenc_anatoliy: Check av_frame_alloc() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 15:18:23 +02:00
Michael Niedermayer
ea9daefe93 compat/os2threads: Check av_malloc() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 15:16:45 +02:00
Michael Niedermayer
cea3c9b281 ffserver: check return code of avio_alloc_context() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 14:45:08 +02:00
Michael Niedermayer
e43f3c8858 avformat/mxfdec: return error instead of segfaulting if there are no streams 
Fixes segfault from ticket 4350

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 13:45:47 +02:00
周晓勇
bb1f153a88 avcodec: loongson3 optimized h264chroma put and avg with mmi 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 13:40:16 +02:00
Luca Barbato
fd11465b21 configure: Use pkg-config for fdk-aac 
Makes the life of the people already setting PKG_CONFIG_PATH simpler.
 2015-06-02 10:33:32 +02:00
Luca Barbato
604abd025d configure: Provide an option to override the environment 
Useful to have `make config` work with custom pkgconf path.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-02 10:33:11 +02:00
Luca Barbato
06db45523c configure: Support the extended pkgconf syntax 
Make possible to require a combination of
packages and/or pin specific versions.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-02 10:33:11 +02:00
Shivraj Patil
aede1a1a60 avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions 
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions (qpel as well as epel) in new file hevc_mc_bi_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Adds HEVC specific macros (needed for this patch) in libavcodec/mips/hevc_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-02 01:54:51 +02:00
Michael Niedermayer
da05c62499 Merge commit '8349bedfa5' 
* commit '8349bedfa5':
  configure: Remove some unnecessary exported config items

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 23:08:33 +02:00
Michael Niedermayer
9ac3417c6b Merge commit 'ff7ae4b9df' 
* commit 'ff7ae4b9df':
  configure: Require LPDIRECT3DSURFACE9 for dxva2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 23:08:12 +02:00
Michael Niedermayer
14617e3a73 Merge commit '172b2cee17' 
* commit '172b2cee17':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
	libavcodec/dxva2.c

See: 94d07b314a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 23:06:32 +02:00
James Almer
7fc6545d5d configure: don't enable any tls protocol if network is disabled 
This was a regression introduced with 4a006b9eb7.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-01 17:49:21 -03:00
Michael Niedermayer
89fa32e5b4 avcodec/snowenc: avoid floats in the rangecoder initialization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 22:30:30 +02:00
Martin Storsjö
8349bedfa5 configure: Remove some unnecessary exported config items 
The only need to be listed if they are to be used in ifdefs from
within the code - config items used as dependencies only within
configure don't need to be exported.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-01 23:04:52 +03:00