xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,927 Commits 35 Branches 386 Tags
0815b230628e9578dc087fbcd5fbdd8a52cd1edd
Commit Graph

54927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer 0815b23062 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Comment out unused labels in simple_idct_arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 10:15:08 +02:00
Michael Niedermayer 5156d482cd avfilter/vf_scale: use the inputs color range when its set and its not overridden 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 02:50:46 +02:00
Michael Niedermayer a7e45cfa11 swscale/sws_getColorspaceDetails: dont fail for non yuv 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 02:50:46 +02:00
Michael Niedermayer 6db57fa8bc avcodec/mjpegdec: Support RGBA lpegs 
Fixes Ticket896

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 00:32:44 +02:00
Michael Niedermayer 436616fd42 swscale: exchange src & dst chroma pos 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 22:43:50 +02:00
Martin Storsjö 54ba52077c arm: Comment out unused labels in simple_idct_arm 
When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:

ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)

Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-24 22:43:21 +03:00
Michael Niedermayer 24a4367ae9 vf_scale: add input h/v_chr_pos parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 18:33:58 +02:00
Michael Niedermayer e31d20255d vf_scale: add output h/v_chr_pos parameterss 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 18:27:10 +02:00
Timothy Gu 11cb697501 doc/encoders: partially rewrite and reformat libx264 docs 
Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-24 16:29:12 +02:00
Bernie Habermeier c5f3cc40e3 matroskaenc: implement CueRelativePosition 
This is a minimal change to matroskaenc that implements CueRelativePosition in the output.
Most players will probably ignore this additional information, but it is in the
matroska spec, and it'd be nice to be able to make use of it.

Signed-off-by: Bernt Habermeier <bernt@wulfram.com>
Tested-by:  wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 14:08:52 +02:00
Michael Niedermayer 101c7ea906 avcodec/mpeg12dec: remove commented out assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 13:00:04 +02:00
Anshul Maheshwari a553cb4683 documented that av_codec_close is required to call 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 12:49:01 +02:00
Michael Niedermayer 800637709c alsdec: minor simplification in read_block() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 12:36:52 +02:00
Michael Niedermayer 7dec8512be Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 12:01:29 +02:00
Michael Niedermayer da0f67b177 Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c' 
* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
	libavcodec/8bps.c

See: 66ff90f4a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 11:45:54 +02:00
Michael Niedermayer 82654172ce Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f' 
* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

See: db5b487551
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 11:31:14 +02:00
Michael Niedermayer a550926705 Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979' 
* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
	libavcodec/alsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 10:31:10 +02:00
Michael Niedermayer 865f34823c Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070' 
* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
	libavcodec/alsdec.c

See: feaff427c0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 10:15:50 +02:00
Zhang Rui 6bab3430a7 avformat/http: support reading compressed data 
Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 04:15:15 +02:00
Michael Niedermayer 274a50ab57 avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected 
A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 01:11:09 +02:00
Luca Barbato 6fd221e5f8 8bps: Make the bound-checks consistent 2013-07-23 23:03:37 +02:00
Luca Barbato bd7b4da0f4 8bps: Bound-check the input buffer 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Luca Barbato 2f034f255c 4xm: Reject not a multiple of 16 dimension 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Luca Barbato ca488ad480 alsdec: Clean up error paths 
Fix at least a memory leak.

CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Luca Barbato 70ecc175c7 alsdec: Fix the clipping range 
mcc_weightings is only 32 elements.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-23 23:03:37 +02:00
Michael Niedermayer 55db06af64 avcodec/utils: use av_assert0() to check validity of input pointers for start code search 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 21:23:09 +02:00
Michael Niedermayer 6a0b72f94f avfilter/avfiltergraph: minor cosmetic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 20:58:21 +02:00
Michael Niedermayer fe328f0807 avfilter: Dont partially merge lists 
This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 19:14:04 +02:00
Hendrik Schreiber 650355089c avformat/aviobuf/ffio_init_context: set seekable automatically 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 17:19:32 +02:00
Michael Niedermayer 7dc77613f6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Mangle external symbols properly in new vfp assembly files

See: 47d57f24e3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 10:30:54 +02:00
Michael Niedermayer abc8110f7e avcodec: add avcodec_chroma_pos_to_enum() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 03:11:28 +02:00
Michael Niedermayer b7397857e2 avcodec: add avcodec_enum_to_chroma_pos() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-23 03:07:30 +02:00
clook 4443213d2e avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder 2013-07-23 01:02:41 +02:00
clook b9b1a2c3e4 libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
Michael Niedermayer 419a3d8a43 avformat/hls: avoid floating point arithmetic 
Should make things more reproducable across platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 19:36:33 +02:00
Zhang Rui 2a5891bb9d avformat/hls: parse EXTINF duration as floating-point number 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 19:34:47 +02:00
Martin Storsjö 69e6702c01 arm: Mangle external symbols properly in new vfp assembly files 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-22 14:48:30 +03:00
Martin Storsjö 47d57f24e3 arm: Mangle external symbols properly in new vfp assembly files 
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 13:16:21 +02:00
Michael Niedermayer 23f250d2bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Add VFP-accelerated version of qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:11:23 +02:00
Michael Niedermayer 366e415836 Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e' 
* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
  dcadsp: Add a new method, qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:10:59 +02:00
Michael Niedermayer c30eb74d18 Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d' 
* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
  arm: Add VFP-accelerated version of fft16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:05:39 +02:00
Michael Niedermayer bacba8e5d1 Merge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac' 
* commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac':
  arm: Add VFP-accelerated version of dca_lfe_fir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 12:04:28 +02:00
Michael Niedermayer 2305a6775d Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206' 
* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
  arm: Add VFP-accelerated version of imdct_half

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:57:05 +02:00
Michael Niedermayer 3cab228005 Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0' 
* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
  arm: Add VFP-accelerated version of int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:55:40 +02:00
Michael Niedermayer 1573274b91 Merge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587' 
* commit '26ffcc7de1d98f77400a2ebe4e75055515c54587':
  dcadec: Use int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:48:43 +02:00
Michael Niedermayer 0d3400ec53 Merge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2' 
* commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2':
  fmtconvert: Add a new method, int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:48:06 +02:00
Michael Niedermayer 877bbe05ce Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971' 
* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
  arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:42:19 +02:00
Michael Niedermayer 0129026c4e Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5' 
* commit '41ef1d360bac65032aa32f6b43ae137666507ae5':
  arm: Add VFP-accelerated version of synth_filter_float

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 11:41:37 +02:00
Michael Niedermayer 9d4dece6b6 Merge commit '8000206abcc82491c2a8c71e494c5477ede7264c' 
* commit '8000206abcc82491c2a8c71e494c5477ede7264c':
  libspeexdec: fix detection of final terminator code

See: f3c9d66baf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 10:56:33 +02:00
Michael Niedermayer 2ca6a13b52 Merge commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1' 
* commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1':
  configure: generate full msvc debug symbols when linking in debug mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 10:34:48 +02:00