virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
67,673 Commits 37 Branches 400 Tags 467 MiB
05e0ea6050
Commit Graph

67673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
05e0ea6050 avfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:45:13 +01:00
Michael Niedermayer
6f373d75e8 Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc' 
* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
  vf_interlace: Add SIMD for lowpass filter

Conflicts:
	libavfilter/vf_interlace.c
	libavfilter/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:39:49 +01:00
Michael Niedermayer
53ab7846ee Merge commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710' 
* commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710':
  atrac3plus: always initialize refwaves

The initialization is not needed, the array is never read before
being written to. Its merged anyway for robustness in respect to
future changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:17:54 +01:00
Michael Niedermayer
85929b9caa avcodec/lpc: remove unneeded {} 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:08:20 +01:00
Michael Niedermayer
d4065a9f47 Merge commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3' 
* commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3':
  lpc: always initialize ref and err

The initialization is not needed, its merged anyway as it might
help suppressing warnings and might make the code more robust against
future changes

See: c4a36b6f70
See: 0dd99628ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 02:05:25 +01:00
Michael Niedermayer
a5adeff457 Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f' 
* commit '3a6ddfb8745e4b306a5637927fb057f630345e2f':
  exr: check return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 01:55:21 +01:00
Michael Niedermayer
ac1735e76d Merge commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1' 
* commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1':
  bgmc: fix sizeof arguments

See: 41bf943f70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 01:53:22 +01:00
Michael Niedermayer
720a8d2b75 Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008' 
* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
  riff: support ProRes in avi (APCN fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 01:47:39 +01:00
Kieran Kunhya
2e1704059a vf_interlace: Add SIMD for lowpass filter 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-15 00:35:31 +01:00
Vittorio Giovara
d16ec1b6db atrac3plus: always initialize refwaves 
CC: libav-stable@libav.org
Bug-Id: CID 1163851
 2014-11-14 20:26:32 +01:00
Vittorio Giovara
60e0ee7ca2 lpc: always initialize ref and err 
CC: libav-stable@libav.org
Bug-Id: CID 29585 / CID 700759
 2014-11-14 20:25:52 +01:00
Vittorio Giovara
3a6ddfb874 exr: check return value 
CC: libav-stable@libav.org
Bug-Id: CID 1198259
 2014-11-14 20:25:21 +01:00
Thilo Borgmann
e4cb6abb2f bgmc: fix sizeof arguments 
CC: libav-devel@libav.org
Bug-Id: CID 608084 / CID 700724
 2014-11-14 20:25:02 +01:00
Vittorio Giovara
4b39cc1a09 riff: support ProRes in avi (APCN fourcc) 2014-11-14 20:24:38 +01:00
Thilo Borgmann
e6e6149630 doc/indevs: Rework and update documentation of AVFoundation device. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 18:28:12 +01:00
Thilo Borgmann
d525e662e4 Changelog: Mention AVFoundation screen capturing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 18:28:12 +01:00
Thilo Borgmann
2045334239 lavd/avfoundation: Introduce device alias 'none' to allow the user to record only audio or video. 
Changes the selection of a default device to none instead of the system default device.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 18:28:12 +01:00
Carl Eugen Hoyos
cde0ad5ea7 tests/Makefile: Fix path for creation of ffprobe-test.nut. 2014-11-14 17:35:26 +01:00
Benoit Fouet
00df32f6a9 avcodec/pngdec: split frame decoding in its own function. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 17:20:43 +01:00
Benoit Fouet
8cab24df07 avcodec/pngdec: create a function to handle small (<=4) bits per pixel values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 17:13:08 +01:00
Benoit Fouet
24ca2ffad8 avcodec/pngdec: use else if instead of if for small bpp handling. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 17:12:39 +01:00
Benoit Fouet
c25b6ae8a2 avcodec/pngdec: fix some indentation/whitespaces 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 16:59:03 +01:00
Benoit Fouet
6499e63f7b avcodec/pngdec: create a function to decode tRNS chunk. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 16:58:37 +01:00
Benoit Fouet
4f313a50ee avcodec/pngdec: create a function to decode PLTE chunk. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 16:17:00 +01:00
Benoit Fouet
b35fa04152 avcodec/pngdec: create a function to decode IDAT chunk. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 16:16:47 +01:00
Benoit Fouet
3f1eaf590c avcodec/pngdec: create a function to decode pHYs chunk. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 15:58:35 +01:00
Benoit Fouet
1523d1484d avcodec/pngdec: create a function to decode IHDR chunk. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 15:58:02 +01:00
Benoit Fouet
98abb98cb1 avcodec/pngdec: rename decode_frame to decode_frame_png 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 15:35:12 +01:00
Peter Ross
b186b7131e avfilter/vf_lut: gammaval709() 
See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-14 02:55:15 +01:00
Clément Bœsch
57688aecbd fate: add xBR filter tests 2014-11-13 22:45:45 +01:00
Aleksey Vasenev
8349001638 avfilter/vf_tinterlace: fix frame rate 
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 22:35:15 +01:00
Aleksey Vasenev
df8248f66e avfilter/vf_interlace: more accurate pts calculation 
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 22:35:15 +01:00
Carl Eugen Hoyos
3428865163 lavc/flashsv2enc: Fix encoding resolution error message. 2014-11-13 22:13:33 +01:00
Michael Niedermayer
5c805d69a4 avcodec/nellymoserenc: fix sign error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 20:48:52 +01:00
Michael Niedermayer
4001fc4267 avcodec/4xm: remove duplicate assert 
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 19:01:08 +01:00
Michael Niedermayer
dae7e4e63d tests/tiny_psnr: remove redundant initialization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 17:54:20 +01:00
James Almer
3cec54b7d7 x86/flacdsp: add SSE2 and AVX decorrelate functions 
Two to four times faster depending on instruction set, block size and channel count.
 2014-11-13 13:47:55 -03:00
Peter Ross
2093c1dc51 cinedec: report white balance gain coefficients using metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 15:31:19 +01:00
Michael Niedermayer
7a79c055e3 Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a' 
* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
  jpeg2000: do not compute the same value twice

Conflicts:
	libavcodec/jpeg2000.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 15:20:40 +01:00
Michael Niedermayer
45660c7d1b Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd' 
* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
  svq1enc: check ff_get_buffer return value

Conflicts:
	libavcodec/svq1enc.c

See: 7effc26ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:54:06 +01:00
Michael Niedermayer
057b74d19c Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f' 
* commit '994ab1804b8bf532f44876927b07b51f1f63247f':
  ansi: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:51:37 +01:00
Michael Niedermayer
04f6a5230d Merge commit 'c7384664ba0cbb12d882effafbc6d321ae706cff' 
* commit 'c7384664ba0cbb12d882effafbc6d321ae706cff':
  avs: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:51:03 +01:00
Michael Niedermayer
b697a3314e Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad' 
* commit '2b5c1efa1465d8646f8be525cace7a21404e40ad':
  g2meet: check ff_set_dimensions return value

Conflicts:
	libavcodec/g2meet.c

See: 3af9d8269e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:31:48 +01:00
Michael Niedermayer
dfa0800c41 Merge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187' 
* commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187':
  indeo3: check ff_set_dimensions return value

See: 81ed7efbe2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:29:52 +01:00
Michael Niedermayer
ecb748866e Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745' 
* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

See: e20ebe491c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:21:58 +01:00
Michael Niedermayer
785f71fcd5 Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a' 
* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a':
  dcadec: initialize variables before use

Conflicts:
	libavcodec/dcadec.c

See: 53918a1c54
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:21:18 +01:00
Michael Niedermayer
2c4d5d3497 Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319' 
* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
  escape124: explicitly set get_bits1 variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:01:41 +01:00
Michael Niedermayer
9b424accbe Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834' 
* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834':
  mlpdec: check for negative index

Conflicts:
	libavcodec/mlpdec.c

See: 8491ac3ad2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:59:53 +01:00
Michael Niedermayer
e266e186cf Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b' 
* commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:46:54 +01:00
Michael Niedermayer
198e55bfa7 Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2' 
* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
  vorbisenc: add missing parenthesis

Conflicts:
	libavcodec/vorbisenc.c

See: f72b735d41
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:34:39 +01:00