virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
50,336 Commits 37 Branches 400 Tags 463 MiB
1672624ddc
Commit Graph

50336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
1672624ddc mpegvideo_enc: fix gray flag with 444 jpeg 
Fixes Ticket2155

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 02:56:06 +01:00
Jean First
2d7044683f ffmpeg_opt: add -to option to specify stop time 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 02:17:42 +01:00
Michael Niedermayer
997a36238f mpeg12: Detect MXF essence stuff at the end of frames 
Fixes some of the issues with segment.mov

See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 18:56:32 +01:00
Michael Niedermayer
e4eedb983d swscale-test: fix 3 pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 16:50:32 +01:00
Michael Niedermayer
c6d3b3be15 aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 16:36:29 +01:00
Michael Niedermayer
e907aa98cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 13:13:10 +01:00
Michael Niedermayer
a984efd104 Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes

Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 13:05:10 +01:00
Michael Niedermayer
9b1a0c2ee8 Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622' 
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 12:56:55 +01:00
Michael Niedermayer
6fbddc80d6 Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655' 
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
	cmdutils.c
	libavcodec/libschroedinger.c
	libavcodec/libschroedingerenc.c
	libavcodec/vorbisenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 12:50:34 +01:00
Michael Niedermayer
13fa074173 Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d' 
* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

Conflicts:
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 12:39:26 +01:00
Michael Niedermayer
2b277f2992 Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47' 
* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 12:32:17 +01:00
Michael Niedermayer
f6fff8e546 ac3enc_template: silence may be used uninitialized in this function warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 02:49:14 +01:00
Michael Niedermayer
5bcb379ffe motion-test: fix warning: dsp_mask is deprecated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 02:49:05 +01:00
Michael Niedermayer
bfcc21a472 libavcodec/motion-test: set the bitexact flag 
this is needed for testing mmx2 functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 02:48:18 +01:00
Diego Biurrun
3a02b6884c configure: icc: Drop nonsense adding of cpuflags to LDFLAGS 
This fixes many icc warnings when not setting the CPU type.
 2013-02-26 00:51:34 +01:00
Diego Biurrun
c242bbd8b6 Remove unnecessary dsputil.h #includes 2013-02-26 00:51:34 +01:00
Diego Biurrun
76b19a3984 Fix a number of incorrect intmath.h #includes. 2013-02-26 00:51:34 +01:00
Justin Ruggles
d925cca95f avconv: remove an unused variable 2013-02-25 15:15:22 -05:00
Justin Ruggles
e8da807537 cmdutils: only use libavresample when it is enabled 
avprobe and avserver use cmdutils and do not strictly require libavresample.
 2013-02-25 15:15:21 -05:00
Justin Ruggles
e951b6d94c vorbisdec: cosmetics: rename variable avccontext to avctx 
This is consistent with the rest of libavcodec.
 2013-02-25 15:15:21 -05:00
Justin Ruggles
699d02b839 libschroedinger: cosmetics: rename variable avccontext to avctx 
This is consistent with the rest of libavcodec.
 2013-02-25 15:15:21 -05:00
Justin Ruggles
09031b4639 vorbisenc: cosmetics: rename variable avccontext to avctx 
This is consistent with the rest of libavcodec.
 2013-02-25 15:15:21 -05:00
slhck
bfcc38ef48 libvpx: check if CQ level is in correct bounds 
Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 20:13:10 +01:00
slhck
188947c32a libvpx: allow 0 as min quantizer value 
Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 20:10:14 +01:00
Jean First
af0e8144cd ffmpeg_opt: cosmetics 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 18:36:21 +01:00
Michael Niedermayer
e6f27346b7 pmpdec: make i unsigned, avoid undefined behavior of i++ 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 18:36:21 +01:00
Michael Niedermayer
a960f3b918 pmpdec: fix integer overflow 
Its unlikely this affects any valid files.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 18:36:21 +01:00
Diego Biurrun
b2d688ea9f configure: Identify icc compiler with a less ambiguous pattern 2013-02-25 18:15:41 +01:00
Diego Biurrun
b58b00aeca configure: Separate "ln" command line arguments 
This is more compatible and not more complicated.
 2013-02-25 18:15:17 +01:00
Paul B Mahol
b8f6912816 fate: update pixfmts_hflip 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 13:16:44 +00:00
Paul B Mahol
e0ccb5fa38 lavfi/hflip: support more formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 13:07:29 +00:00
Paul B Mahol
eac93932b0 lavfi/geq: improve support for formats with alpha plane 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 12:54:40 +00:00
Michael Niedermayer
875f883185 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vorbisdec: Accept 0 amplitude_bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 12:58:31 +01:00
Michael Niedermayer
f7dc6aa5fe Merge commit '5b47c19bfda92273ae49e83db26a565afcaed80a' 
* commit '5b47c19bfda92273ae49e83db26a565afcaed80a':
  vorbisdec: Add missing checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 12:52:45 +01:00
Michael Niedermayer
a0312a2e85 Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0' 
* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0':
  vorbisdec: cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 12:30:41 +01:00
Michael Niedermayer
cb72f698fe Merge commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc' 
* commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc':
  vorbisdec: Error on bark_map_size equal to 0.
  dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 12:22:18 +01:00
Luca Barbato
23bd9ef4b2 vorbisdec: Accept 0 amplitude_bits 
The specification does not prevent an encoder to write the amplitude 0
as 0 amplitude_bits.

Our get_bits() implementation might not support a zero sized read
properly, thus the additional branch.
 2013-02-25 07:34:00 +01:00
Luca Barbato
5b47c19bfd vorbisdec: Add missing checks 
Rate and order must not be 0 even if the specification does not say that
explicitly.
 2013-02-25 07:34:00 +01:00
Luca Barbato
fc386f2eea vorbisdec: cosmetics 
Use the commonly used "if (!var)" instead of "if (var == 0)".
 2013-02-25 07:34:00 +01:00
Michael Niedermayer
11dcecfcca vorbisdec: Error on bark_map_size equal to 0. 
The value is used to calculate output LSP curve and a division by zero
and out of array accesses would occur.

CVE-2013-0894

CC: libav-stable@libav.org

Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-02-25 07:33:59 +01:00
Michael Niedermayer
bb7bc3443d af_biquads: memset(0) cache 
Fixes valgrind warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Michael Niedermayer
35aaa306ac swr: make the default of nopts for first_pts actually work 
Fixes Ticket2210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Michael Niedermayer
7f2ab129b1 fate: force a first_pts=0 for the aresample test 
This is needed to prevent the next commit from breaking fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Michael Niedermayer
e42028925b ffmpeg: Force a first_pts of 0 for the first configuration of -async use 
This is very close to what the default does currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Stefano Sabatini
394130efe3 ffplay: reindent and remove pointless cast in audio_decode_frame() code 2013-02-24 23:29:42 +01:00
Stefano Sabatini
a3fa27e366 ffplay: set type for channel_layout AudioParams field to int64_t 
Reflect the type of the corresponding field in lavc/lavfi.
 2013-02-24 23:26:43 +01:00
Stefano Sabatini
566560b85c lavfi/abuffersink: fix weird indent and spacing 2013-02-24 23:22:23 +01:00
Stefano Sabatini
b59cd089ff lavfi/abuffersink: add sample_rates field to AVABufferSinkParams 
Allow to select sample rates.
 2013-02-24 23:21:28 +01:00
Stefano Sabatini
5085b46496 lavc: change type of AVFrame.channels field from int64_t to int 
"channels" is an int in all the other places in the libraries, and the
av_frame_*_channels() accessors return and set an int, so this should not
implicate ABI breaks.
 2013-02-24 23:14:46 +01:00
Michael Niedermayer
ad899522ff ffmpeg: use a AVDictionary instead of the context to move swr parameters around 
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00