virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
45,330 Commits 37 Branches 400 Tags 467 MiB
9ba2484ece
Commit Graph

45330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9ba2484ece af_aresample: fix leak on alloc failure 
Fixes CID733798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 16:48:25 +02:00
Michael Niedermayer
7457da3698 drawtext: fix leak with timecodes 
Fixes CID733799
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 16:45:50 +02:00
Michael Niedermayer
bb35864759 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mlpdsp: adding missing file
  dsputil: split out mlp dsp function
  sh4: add required #include, fix build
  averror: make error values proper negative values
  build: do not use LIB as variable name
  build: whitespace cosmetics
  build: remove single-use variable THIS_LIB

Conflicts:
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 15:55:41 +02:00
Michael Niedermayer
526cb36e4b Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
  build: remove references to unused EXTRAOBJS variable
  lavfi: convert input/ouput list compound literals to named objects
  fate: add h263 obmc vsynth tests
  avconv: remove bogus warning when using avconv -h without parameter
  averror: explicitly define AVERROR_* values
  flashsv: propagate inflateReset() errors
  indeo4/5: remove constant parameter num_bands from wavelet recomposition
  mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
  Double motion vector range for HPEL interlaced picture in proper place

Conflicts:
	libavcodec/v210dec.h
	libavfilter/af_aformat.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_channelmap.c
	libavfilter/af_join.c
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/f_setpts.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_select.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_testsrc.c
	libavformat/mxfdec.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 15:46:48 +02:00
Michael Niedermayer
a75dd13b1b Merge commit 'eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf' 
* commit 'eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf':
  vc1dec: Set opposite to the correct value for 1REF field pictures

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 14:36:36 +02:00
Michael Niedermayer
ce27c9eb25 Merge commit '7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692' 
* commit '7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692':
  vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 14:32:41 +02:00
Michael Niedermayer
b6c3487e7f Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c' 
* commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c':
  vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
  segment: support applehttp style list

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 14:28:18 +02:00
Michael Niedermayer
de31814ab0 Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' 
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6':
  avio: introduce avio_closep
  mpegtsenc: set muxing type notification to verbose
  vc1dec: Use correct spelling of "opposite"
  a64multienc: change mc_frame_counter to unsigned
  arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
  svq1: Drop a bunch of useless parentheses
  parseutils-test: do not print numerical error codes
  svq1: K&R formatting cosmetics

Conflicts:
	doc/APIchanges
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavformat/version.h
	libavutil/parseutils.c
	tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 14:03:12 +02:00
Luca Barbato
1ec6293086 mlpdsp: adding missing file 2012-10-11 12:34:36 +02:00
Luca Barbato
2d6caade22 dsputil: split out mlp dsp function 2012-10-11 12:01:08 +02:00
Mans Rullgard
25dc79bc14 sh4: add required #include, fix build 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-11 10:55:26 +01:00
Stefano Sabatini
c4aaff8c02 Revert "configure: link flite against libasound" 
This reverts commit 396648cc6a.

The commit made impossible to build against libflite if libasound is not
available (e.g. on Windows). Thus remove the -lasound flag. In case of
libflite static linking the workaround is to enable
--extra-ldflags=-lasound (or disable the ALSA output device in libflite).
 2012-10-11 11:19:18 +02:00
Stefano Sabatini
396648cc6a configure: link flite against libasound 
libflite depends on libasound. Fix a linking failure when linking against
a static version of libflite.

Reported-by: Vladimir Kraljevic
 2012-10-11 11:08:48 +02:00
Paul B Mahol
8cd1c0febe pcx: convert to bytestream2 API 
Protects against overreads in input buffer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-11 08:06:45 +00:00
Michael Niedermayer
492b8ec4c5 av_opt_set_from_string: fix memleak 
Fixes CID733801
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 04:42:52 +02:00
Michael Niedermayer
7df9f595c9 swri_resample_init: unsupported sample formats are an internal error. 
This condition cannot happen.

Fixes CID733802
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 04:36:23 +02:00
Michael Niedermayer
e47ab0b2c9 ffmpeg_opt: dont fail for sameq/same_quant. 
Instead print a warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 04:00:16 +02:00
Michael Niedermayer
4334ba043e ffprobe: fix use of uninitialized pointer in av_strtok() 
Fixes CID733837
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 03:37:43 +02:00
Michael Niedermayer
bdcff5af7f af_volumedetect: fix use of uninitilaized variable in case of planar audio. 
Fixes: CID733841
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 03:12:40 +02:00
Michael Niedermayer
989c91b504 asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok() 
Fixes CID733842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 03:00:34 +02:00
Michael Niedermayer
4e4ae2f82c sha: change loop condition to be tighter. 
This makes no change to the way the code functions, but should make
it easier for static analyzers to see the valid range for i

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:42:18 +02:00
Michael Niedermayer
fac1ccbda1 swscale-test: fix freeing of uninitialized variable 
Fixes: CID733844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:21:28 +02:00
Matthieu Bouron
e782d8728f fate: add vf_idet filter to lavfi regression tests 
This test only make sure that the idet filter does not crash.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:21:28 +02:00
Michael Niedermayer
4d4f431ab7 vf_idet: zero pointers after freeing references 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:21:28 +02:00
Michael Niedermayer
cac749a551 vf_idet: fix free after use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:21:28 +02:00
Janne Grunau
1a2c7880aa averror: make error values proper negative values 
Fixes stupid mistake in 25227c3a78.
 2012-10-11 01:07:57 +02:00
Mans Rullgard
4436f25a16 build: remove references to unused EXTRAOBJS variable 
This was part of a ghastly hack that is long since gone.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-10 23:46:31 +01:00
Mans Rullgard
effe443877 build: do not use LIB as variable name 
The Microsoft linker uses the LIB environment variable which
clashes with a make variable of the same name.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-10 23:46:31 +01:00
Mans Rullgard
1c7428e655 build: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-10 23:46:31 +01:00
Mans Rullgard
e5c6e9a6f2 build: remove single-use variable THIS_LIB 
Replace the single use of THIS_LIB with its value.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-10 23:46:31 +01:00
Carl Eugen Hoyos
1a104bf641 Fix broken timestamps for some mp3 in avi samples. 
Mostly based on 73ad355 by Michael Niedermayer.
Fixes ticket #606.
 2012-10-10 23:59:43 +02:00
Mans Rullgard
568c70e79e lavfi: convert input/ouput list compound literals to named objects 
A number of compilers, for example those from TI and IBM, choke on
these initialisers.  The current style is also quite ugly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-10 22:26:12 +01:00
Michael Niedermayer
317505b566 lavf: do not prematurely accept a format with low score in init_input() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 21:41:20 +02:00
Michael Niedermayer
b47396b614 img2dec: detect .raw files only with a low score as img2 
They can be many other things and this otherwise breaks probing of some .raw files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 21:40:03 +02:00
Michael Niedermayer
94f5470a20 lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 21:39:19 +02:00
Janne Grunau
b404c66056 fate: add h263 obmc vsynth tests 2012-10-10 21:24:32 +02:00
Janne Grunau
8d09d39a4b avconv: remove bogus warning when using avconv -h without parameter 2012-10-10 21:24:32 +02:00
Janne Grunau
25227c3a78 averror: explicitly define AVERROR_* values 2012-10-10 21:24:32 +02:00
Janne Grunau
c466eb1746 flashsv: propagate inflateReset() errors 
Fixes CID717493.
 2012-10-10 21:24:32 +02:00
Janne Grunau
6d556e8327 indeo4/5: remove constant parameter num_bands from wavelet recomposition 
Fixes bogus uninitialized value compiler and coverity warnings.
 2012-10-10 21:24:32 +02:00
Janne Grunau
bd141f5ec9 mxfdec: return error if no segments are available in mxf_get_sorted_table_segments 
Fixes CID732275.
 2012-10-10 21:24:32 +02:00
Mashiat Sarker Shakkhar
35a35d49d2 Double motion vector range for HPEL interlaced picture in proper place 
The existing code is not in the right place and it should cover both
interlaced frame and field pictures.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-10 14:56:02 -04:00
Mashiat Sarker Shakkhar
eb657ecefd vc1dec: Set opposite to the correct value for 1REF field pictures 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-10 14:55:38 -04:00
Mashiat Sarker Shakkhar
7cc3c4e1d4 vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma 
This is required due to the way VC-1 handles chroma pull-back which may end
up causing negative chroma MV for zero luma MV. Edge emulation needs to be
invoked in such cases.

This only affects vertical component of chroma motion vector.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-10 14:54:19 -04:00
Mashiat Sarker Shakkhar
88058d9a99 vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures 
Interlaced field pictures can have one or two reference pictures, signaled
by NUMREF syntax element. For single reference pictures, reference picture
is determined by REFFIELD syntax element.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-10 14:50:07 -04:00
Luca Barbato
b522000e9b avio: introduce avio_closep 2012-10-10 18:56:55 +02:00
Luca Barbato
26db9100b2 segment: support applehttp style list 2012-10-10 18:56:55 +02:00
Luca Barbato
82569b01a1 mpegtsenc: set muxing type notification to verbose 2012-10-10 18:56:54 +02:00
Michael Niedermayer
9586db6ae5 lavc: docs: the field_order is set by the demuxer and not libavcodec for decoding 
This makes the documentation match the implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 18:50:56 +02:00
Michael Niedermayer
92c3173c84 qt-faststart: fix printf argument type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 18:50:56 +02:00