wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
45369 commits 40 branches 405 tags 230 MiB
Commit graph

45369 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
f391e405df Merge commit 'e002e3291e' 
* commit 'e002e3291e':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
	doc/APIchanges
	libavcodec/svq3.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 14:52:34 +02:00
Michael Niedermayer
d6135a886d Merge commit '15ba7f6525' 
* commit '15ba7f6525':
  parseutils: fix const removal warning
  prepare 9_beta1 release

Conflicts:
	Changelog
	RELEASE
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 14:38:04 +02:00
Michael Niedermayer
e335658370 Merge commit '9734b8ba56' 
* commit '9734b8ba56':
  Move avutil tables only used in libavcodec to libavcodec.

Conflicts:
	libavcodec/mathtables.c
	libavutil/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 14:26:46 +02:00
Michael Niedermayer
43cce41267 Merge commit '0a75d1da23' 
* commit '0a75d1da23':
  options_table: refs option is not snow-only
  random_seed: Support using CryptGenRandom on windows
  doc: update the faq entry about custom I/O

Conflicts:
	doc/faq.texi
	libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 14:15:33 +02:00
Paul B Mahol
caa7e24eb1 truemotion2: remove unreachable code 
Fixes CID610345.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 11:54:38 +00:00
Paul B Mahol
4dcf71aacc takdec: stop decoding in case of unknown bps 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 09:18:58 +00:00
Paul B Mahol
56519d7d14 takdec: s/bits_per_coded_sample/bits_per_raw_sample 
bits_per_coded_sample should be set from demuxer and
not from decoder.

Prior to this change value set from demuxer would get
overwritten in decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 09:07:31 +00:00
Michael Niedermayer
62722ae2d4 nellymoserenc: fix array element ordering 
Fixes assertion failures in trellis encoder
Fixes valgrind warnings in trellis encoder
Fixes CID732257
Fixes CID732256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 04:19:38 +02:00
Michael Niedermayer
927d866a99 tscc2: fix out of array access 
Fixes CID732260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 02:26:50 +02:00
Michael Niedermayer
5a75924dfd rtmpproto: fix out of array write 
Fixes CID732263
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 02:06:51 +02:00
Michael Niedermayer
e576105d84 motion-test: zero dsp context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 01:44:35 +02:00
Michael Niedermayer
5e689b65ce dv: zero dsp before init, this fixes use of uninitialized dct_bits 
Fixes CID732292
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 01:43:11 +02:00
Michael Niedermayer
e0909ff158 lavc: Fix use of uninitialized field. 
Fixes CID732297
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 00:22:15 +02:00
Michael Niedermayer
0c6b9b9fe5 rtspdec:read_line: fix use of uninitialized byte 
Fixes CID732301
Fixes CID723300
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 00:08:28 +02:00
Michael Niedermayer
1b5069aa41 sanm: fix off by 1 error in draw_glyph() 
This fix changes nothing as nothing passed a so large value

Fixes CID733785
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 00:08:28 +02:00
Michael Niedermayer
59cbedfc3d update_initial_timestamps: increase pts_buffer size 
Fixes CID733786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 00:08:28 +02:00
Martin Storsjö
e002e3291e Use the new aes/md5/sha/tree allocation functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-11 23:35:28 +03:00
Martin Storsjö
9a92aea27b avutil: Add functions for allocating opaque contexts for algorithms 
The current API where the plain size is exposed is not of much
use - in most cases it is allocated dynamically anyway.

If allocated e.g. on the stack via an uint8_t array, there's no
guarantee that the struct's members are aligned properly (unless
the array is overallocated and the opaque pointer within it
manually aligned to some unspecified alignment).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-11 23:35:27 +03:00
Paul B Mahol
3632f35c8e bethsoftvid: check return value of av_packet_new_side_data() 
Fixes null pointer dereference, fixes CID733777.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-11 19:40:27 +00:00
Mans Rullgard
fb32f31af7 svq3: fix pointer type warning 
Fixes:
libavcodec/svq3.c:661:9: warning: passing argument 2 of 'svq3_decode_block' from incompatible pointer type
libavcodec/svq3.c:208:19: note: expected 'DCTELEM *' but argument is of type 'DCTELEM (*)[32]'

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-11 20:40:23 +01:00
Mans Rullgard
366b72f149 svq3: replace unsafe pointer casting with intreadwrite macros 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-11 20:40:23 +01:00
Paul B Mahol
313b40efbd bmp: unbreak non BMP_RGB compression for v4 and v5 
Fixes CID733728 & CID733729.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-11 18:05:06 +00:00
Mans Rullgard
15ba7f6525 parseutils: fix const removal warning 
The const qualifier is still removed although it happens inside
the strtol() function so no warning is generated.

Fixes:
libavutil/parseutils.c:110:11: warning: assignment discards qualifiers from pointer target type

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-11 18:00:27 +01:00
Mans Rullgard
68e360a83c parseutils-test: various cleanups 
- make tables static const
- remove useless use of compound literal
- break long lines
- fix a comma/semicolon typo

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-11 18:00:27 +01:00
Clément Bœsch
9ad1ea13e0 lavfi/ebur128: fix typo in condition. 
Fixes CID733727.
 2012-10-11 18:41:07 +02:00
Janne Grunau
e578f8f468 prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
Diego Biurrun
9734b8ba56 Move avutil tables only used in libavcodec to libavcodec. 2012-10-11 18:29:36 +02:00
Michael Niedermayer
26474d1098 random_seed: fix digest size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 18:28:21 +02:00
Michael Niedermayer
7fe5548531 random_seed: fix out of array read 
Fixes CID733787
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 18:28:21 +02:00
Diego Biurrun
0a75d1da23 options_table: refs option is not snow-only 2012-10-11 18:27:44 +02:00
Michael Niedermayer
adcbb3fd8b yuv2rgb: fix declared array sizes, so they match actuals. 
Fixes CID733789, and others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 18:20:24 +02:00
Martin Storsjö
1093383d6c random_seed: Support using CryptGenRandom on windows 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-11 18:49:34 +03:00
Michael Niedermayer
b96d1859d5 jpeglsenc: favor av_freep() for saftey over av_free() when a variable is still accessible afterwards 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 17:45:36 +02:00
Michael Niedermayer
34bbab432c jpeglsnec: fix memleak of state in error case 
Fixes CID733794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 17:44:58 +02:00
Michael Niedermayer
104b1d9e10 libvpxenc: fix memleak on error path 
Fixes CID733795
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 17:41:36 +02:00
Michael Niedermayer
c9454cb643 av_tempfile: fix leak in error case 
Fixes CID733796 Part2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 17:09:57 +02:00
Michael Niedermayer
229ccce6cc libxvid_rc: fix leaks in ff_xvid_rate_control_init() 
Fixes CID733796 Part1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 17:08:33 +02:00
Michael Niedermayer
4b20b21b8d tiff: fix leak on error return in doubles2str() 
Fixes CID733797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 16:51:08 +02:00
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 '4436f25a16' 
* commit '4436f25a16':
  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
Luca Barbato
26b3fde6a7 doc: update the faq entry about custom I/O 
URLProtocols are private and custom AVIOContexts are a simple and
easier solution for most of the situations.
 2012-10-11 15:12:30 +02:00
Michael Niedermayer
a75dd13b1b Merge commit 'eb657ecefd' 
* commit 'eb657ecefd':
  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 '7cc3c4e1d4' 
* commit '7cc3c4e1d4':
  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 '88058d9a99' 
* commit '88058d9a99':
  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 'b522000e9b' 
* commit 'b522000e9b':
  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