ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 06:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,675 Commits 36 Branches 398 Tags 535 MiB
7da5ff5c18
Commit Graph

62675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
7da5ff5c18 Merge commit '5d983fdbca5570a1545a892583a372cfb3fffe92' 
* commit '5d983fdbca5570a1545a892583a372cfb3fffe92':
  flv: Warn only once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 21:37:26 +02:00
Michael Niedermayer
277ae5a7b3 Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01' 
* commit '374fdc8c071dcd96422378b0a1a0d453336d8a01':
  flv: Improve log messages

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 21:27:09 +02:00
Michael Niedermayer
31f2357fd0 avdevice/qtkit: fix include 
Fixes: Ticket 3588

Found-by: jeremyhu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 05:12:07 +02:00
YuDenzel
443936d8b9 configure: Fix ld flags when rpath is enabled. 
Provide correct rpath flags to ld when --enable-rpath is provided.
 2014-04-24 03:03:45 +02:00
Michael Niedermayer
291d464161 swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input 
Fixes Ticket 3542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 01:25:46 +02:00
Michael Niedermayer
417ae6281b Merge commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84' 
* commit '7cade8ea2bb19e78dae42b29720535a70fb2ae84':
  on2avc: change a comment at #endif to match actual define

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 23:03:20 +02:00
Michael Niedermayer
23cd5cb18f avcodec/fic: avoid 2 additions per idct row 
before:
5225 decicycles in IDCT, 32756 runs, 12 skips

after:
5057 decicycles in IDCT, 32765 runs, 3 skips

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 22:34:31 +02:00
Michael Niedermayer
c26b4b6f55 fate/libswresample: use linear interpolation on both aresample filters 
This also tests LINEAR_CORE_FLT_SSE

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 22:05:47 +02:00
Michael Niedermayer
fc145e576a avformat/h263dec: Fix h263 probe 
The code was missing 1 bit in the src format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 21:54:13 +02:00
Luca Barbato
5d983fdbca flv: Warn only once 
No point in sending the message multiple time.
 2014-04-23 21:19:27 +02:00
Michael Niedermayer
2c4862e7a1 avfilter/avcodec: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 21:13:53 +02:00
Michael Niedermayer
0bfb1e9238 avdevice/jack_audio: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 21:13:31 +02:00
Luca Barbato
374fdc8c07 flv: Improve log messages 
Messages should start with a capital letter and possibly end with a "."
if they are statements.
 2014-04-23 21:04:20 +02:00
Kostya Shishkov
7cade8ea2b on2avc: change a comment at #endif to match actual define 2014-04-23 20:54:29 +02:00
Michael Niedermayer
56efd98a65 Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
  On2 AVC decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 20:47:13 +02:00
Michael Niedermayer
ecb815e511 Merge commit 'd7eb8f903338048c0b222d92357d67f5d3b54295' 
* commit 'd7eb8f903338048c0b222d92357d67f5d3b54295':
  fic: Make warning message more accurate
  fic: Remove redundant clips
  fic: Simplify alpha blending

See: 14da7f9eb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 20:38:30 +02:00
Kostya Shishkov
e2834567d7 On2 AVC decoder 2014-04-23 19:57:44 +02:00
Derek Buitenhuis
14da7f9eb7 fic: Support rendering cursors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-23 13:31:22 -04:00
Derek Buitenhuis
d7eb8f9033 fic: Make warning message more accurate 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-23 17:53:00 +01:00
Derek Buitenhuis
7596fc3d4b fic: Remove redundant clips 
The equations can't overflow or underflow anyway.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-23 12:40:39 -04:00
Michael Niedermayer
1aa388d439 avcodec/jpeg2000dwt: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 15:52:45 +02:00
Michael Niedermayer
7de2cea8a9 avcodec/motionpixels: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 15:52:28 +02:00
Michael Niedermayer
c161134035 avcodec/snow_dwt: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 15:51:41 +02:00
kyh96403
f21c263c89 avformat/rtmppkt: Fix random crash 
Fixes Ticket3564

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 15:10:42 +02:00
Stefano Sabatini
1ba59b1cbe ffprobe: fix scaling of vali in value_string() in case -prefix is selected 
Fix trac ticket #3523.
 2014-04-23 10:32:42 +02:00
Stefano Sabatini
bf411fffd4 examples: rename avcodec.c to decoding_encoding.c 
Restore the old name, which was more meaningful and consistent with the
names of the other examples.
 2014-04-23 10:32:42 +02:00
Michael Niedermayer
dc6a17cf74 avformat/mux: Check for and remove invalid packet durations 
Fixes assertion failure
Fixes Ticket3575

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 06:55:33 +02:00
Michael Niedermayer
b9017fdd42 avformat/flvdec: also include file position in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 03:55:41 +02:00
Michael Niedermayer
e79b15f5f1 avutil/avutil.h: remove duplicate rational.h include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 00:58:15 +02:00
Michael Niedermayer
d3f3035f08 Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8' 
* commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8':
  avutil: move av_get_time_base_q() after include rational.h

See: c7251fec39
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 00:48:02 +02:00
Michael Niedermayer
c2cd0945c9 Merge commit '502512ea0f179165782777265f441d4061ff6012' 
* commit '502512ea0f179165782777265f441d4061ff6012':
  avutil: Add av_get_time_base_q()

Conflicts:
	doc/APIchanges
	libavutil/utils.c
	libavutil/version.h

See: dac7e8a94e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 00:38:39 +02:00
Michael Niedermayer
4b6bb7bfe1 Merge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b' 
* commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b':
  fic: Support rendering cursors

Not merged as the commit is missing changes that where replied to with "done" on ffmpeg-devel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 00:19:12 +02:00
Michael Niedermayer
83412f00e9 Merge commit '40b331e1f41cf118bd1b0807cac801437255636f' 
* commit '40b331e1f41cf118bd1b0807cac801437255636f':
  fic: Use proper quantization matrix index

See: 6d149d2818
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:58:21 +02:00
Derek Buitenhuis
e299cb2cd3 fic: Simplify alpha blending 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 17:51:43 -04:00
Michael Niedermayer
cc17ff8826 Merge commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261' 
* commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261':
  aarch64: NEON vorbis_inverse_coupling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:51:19 +02:00
Michael Niedermayer
59bfddfcda Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4' 
* commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4':
  aarch64: NEON fixed/floating point MPADSP apply_window

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:45:50 +02:00
Michael Niedermayer
b0bdc2a712 avutil: move av_get_time_base_q() after include rational.h 
Fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 17:35:51 -04:00
Michael Niedermayer
96a4d0c1c3 Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924' 
* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
  aarch64: NEON float to s16 audio conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:33:07 +02:00
Michael Niedermayer
ef1961e7fc Merge commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855' 
* commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855':
  aarch64: NEON float (i)MDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:27:02 +02:00
Michael Niedermayer
13f4428915 Merge commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62' 
* commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62':
  aarch64: NEON float FFT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:06:24 +02:00
Michael Niedermayer
c7251fec39 avutil: move av_get_time_base_q() after include rational.h 
Fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 22:44:14 +02:00
Derek Buitenhuis
dac7e8a94e avutil: Add av_get_time_base_q() 
This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-22 16:38:33 -04:00
Derek Buitenhuis
502512ea0f avutil: Add av_get_time_base_q() 
This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-22 16:32:35 -04:00
Derek Buitenhuis
6d149d2818 fic: Use proper quantization matrix index 
The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 16:22:08 -04:00
Derek Buitenhuis
9155c595f1 fic: Support rendering cursors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 21:20:23 +01:00
Derek Buitenhuis
40b331e1f4 fic: Use proper quantization matrix index 
The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 21:20:23 +01:00
Janne Grunau
3956a5e0ea aarch64: NEON vorbis_inverse_coupling 
From the ARMv7 NEON version. 16 times faster as the C version, overall
more than 12% faster vorbis decoding on Apple's A7.
 2014-04-22 22:01:45 +02:00
Janne Grunau
8f9fe6ae34 aarch64: NEON fixed/floating point MPADSP apply_window 
30%/25% (fixed/float) faster mp3 decoding on Apple's A7. The floating
point decoder is approximately 7% faster.
 2014-04-22 22:01:45 +02:00
Reimar Döffinger
ab14bcb104 Add "const" to avoid compiler warning. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Reimar Döffinger
3bd7a7149f Add missing ';'. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00