virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
64,707 Commits 37 Branches 400 Tags 464 MiB
a3f752bcee
Commit Graph

64707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
726e253b00 avformat/img2dec: allocate and clear padding area for probe correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 04:00:27 +02:00
Michael Niedermayer
7d179b126b Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavf/ftp: always treat all response codes >= 500 as error
  lavf/ftp: explicitly enable UTF-8
  lavf/ftp: make response parsing more RFC compliant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 02:19:07 +02:00
James Almer
9937362c54 x86/swr: use lavu helper macros to check CPU extensions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 02:12:16 +02:00
Carl Eugen Hoyos
4c145b692c Autodetect JPEG2000 imagess. 
Autodetection of jp2 files does not work yet, the files are detected
as mov.
 2014-07-04 02:10:26 +02:00
James Almer
8279a15284 x86/swr: split audioconvert and rematrix DSP into separate files 
Also rename resample_x86_dsp.c to resample_init.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 02:00:11 +02:00
James Almer
857cd1f33b swr: initialize only the necessary resample dsp functions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 01:37:41 +02:00
Lukasz Marek
c82521713d lavf/ftp: always treat all response codes >= 500 as error 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-07-04 01:21:08 +02:00
Lukasz Marek
a0358db323 lavf/ftp: explicitly enable UTF-8 
Most FTP servers enable UTF-8 by default, but it is not required by the standard.
Enabling it manually makes ffmpeg implementation more consistent when server
doesn't enable it by default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-07-04 01:21:08 +02:00
Lukasz Marek
3ba6dce48d lavf/ftp: make response parsing more RFC compliant 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-07-04 01:21:08 +02:00
Michael Niedermayer
5c65aed7fd Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8' 
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
	libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 01:17:39 +02:00
Michael Niedermayer
cf8c44fc47 Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced' 
* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 01:08:57 +02:00
Michael Niedermayer
b28fcbba0c Merge commit '9279826008b80daad7446950a821f32033ccd33f' 
* commit '9279826008b80daad7446950a821f32033ccd33f':
  id3v2enc: use a case-insensitive comparison for APIC picture type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 00:50:40 +02:00
Oliver Fromme
d73823286d avcodec/dvdsubdec: fix alpha in debuging code 
improve the debugging function for saving subtitles
to PPM files: Actually use the alpha channel.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 00:35:21 +02:00
Oliver Fromme
3f0a3e9e12 avcodec/dvdsubdec: Fix off-by-one error 
Fix an off-by-one error that causes the height of decoded
subtitles to be too small, thus cutting off the lowest row
of pixels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 00:32:43 +02:00
Diego Biurrun
391ecc961c x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase 2014-07-03 13:41:41 -07:00
Michael Niedermayer
a9ce5d92e6 Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1' 
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 21:42:16 +02:00
Justin Ruggles
c6698dfe7c webpdec: Fix decoding of the huffman group indices. 
Per the specification, "The red and green components of a pixel
define the meta Huffman code used in a particular block of the ARGB
image."
 2014-07-03 15:29:01 -04:00
Michael Niedermayer
524eeaca22 Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0' 
* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
	tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 21:02:56 +02:00
Anton Khirnov
9279826008 id3v2enc: use a case-insensitive comparison for APIC picture type 2014-07-03 18:40:37 +00:00
Michael Niedermayer
0d35d5ab1b Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e' 
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 20:37:06 +02:00
Nidhi Makhijani
0955e57ad0 daud: split muxer and demuxer 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-03 10:46:11 -07:00
Martin Storsjö
f920d08953 ismindex: Add an option for outputting files elsewhere than in the current directory 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-03 20:13:27 +03:00
Martin Storsjö
6bc4934b75 ismindex: Allow adding a path prefix to the generated .ism file 
This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-03 20:13:13 +03:00
Carl Eugen Hoyos
d538dd824e avformat: Add image3 demuxers with format autodetection 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 18:14:06 +02:00
James Zern
dea377fcc0 ivfenc: support VP9 
libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 15:46:26 +02:00
Leandro Santiago
4582e1162a avfilter/vf_drawtext: fix resource leak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 15:45:15 +02:00
Michael Niedermayer
a3c479fc49 avformat/avformat: minor grammar improvement 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:51:53 +02:00
Michael Niedermayer
44f079b27e Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b' 
* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
	libavformat/avformat.h

See: 61f96be08a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:39:23 +02:00
Michael Niedermayer
982920cfaa Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5' 
* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:19:34 +02:00
Michael Niedermayer
33f6ba9c4e avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:05:58 +02:00
Paul B Mahol
b52c26c66f avfilter: add flanger filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 08:07:42 +00:00
Paul B Mahol
7e8c1f0c38 avfilter/af_aphaser: move wave table generation code into separate file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 07:34:11 +00:00
Vittorio Giovara
cdab9db2ad lavf: document av_dump_format() 2014-07-02 23:37:21 -04:00
Luca Barbato
df949b645b hevc: Use the local context variable when needed 2014-07-02 23:30:49 -04:00
Michael Niedermayer
1265247206 avfilter/vf_format: Check pix_fmts before dereferencing it 
Fixes CID1224286

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 02:29:49 +02:00
Michael Niedermayer
5ab67340f9 avfilter/avfiltergraph: dont "or" together error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 02:29:49 +02:00
Carl Eugen Hoyos
b02cfad7d2 Fix standalone compilation of the wtv muxer. 2014-07-02 23:41:29 +02:00
Michael Niedermayer
ce6a1ff2a1 avcodec/on2avc: Fix out of array access 
Fixes CID1206648

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 20:22:12 +02:00
Michael Niedermayer
61815ef85b Merge commit '98569d89638efc325042bd0081e9a02181afdafa' 
* commit '98569d89638efc325042bd0081e9a02181afdafa':
  matroskadec: Fix a double negation typo

See: 2c5b92fe90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 20:18:16 +02:00
Anshul Maheshwari
43d70a776d avcodec: Updated comment for sub param 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Anshul Maheshwari
7d1898ebcc avcodec/dvbsubdec: removed unnecessary null check for subtitle 
In refrence to coverity defect 1224278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Michael Niedermayer
98569d8963 matroskadec: Fix a double negation typo 
This typo has existed since this code was added in c16582579.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-02 20:15:42 +03:00
Stefano Sabatini
462c9ee3ac lavfi/overlay: show incoming frames on debug messages 
This is especially useful to debug queue overflow issues.

Ideally we should be able to set the debug message at the
dualinput/framesync level, but they do not have the information related
to the filter context and the inlink, so cannot access much useful
information.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-02 18:42:15 +02:00
Michael Niedermayer
5307fa00a4 avcodec/dvdec: remove redundant null check 
Fixes CID700682 again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 16:37:38 +02:00
Michael Niedermayer
d266ecff4b avcodec/bitstream: remove trivial assert 
Fixed CID1224273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 16:25:40 +02:00
James Almer
b5f0eac068 swr: rename swresample_dsp init functions to swri_resample_dsp 
The swresample_ prefix is not for internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 13:18:30 +02:00
Dave Rice
1619a0e2b8 doc/filters: fix typo 
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 13:09:12 +02:00
Michael Niedermayer
4930cd13d6 ffmpeg: check av_opt_set_dict() return 
Fixes CID1224275

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 05:53:13 +02:00
Dave Rice
79d3eeb2b7 doc/ffprobe.xsd: fix order and missing elements/attributes 
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:55:54 +02:00
James Almer
42a92a240d swr: remove obsolete resample prototypes 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:14:45 +02:00