virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
34,291 Commits 37 Branches 400 Tags 460 MiB
22fe93ea39
Commit Graph

195 Commits

Author SHA1 Message Date
Michael Niedermayer
41f55277fa Merge remote-tracking branch 'qatar/master' 
* qatar/master: (34 commits)
  h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
  error_resilience: fix the check for missing references in ff_er_frame_end() for H264
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  AVOptions: refactor set_number/write_number
  AVOptions: cosmetics, rename static av_set_number2() to write_number().
  AVOptions: cosmetics, move and rename static av_set_number().
  AVOptions: split av_set_string3 into opt type-specific functions
  avidec: fix signed overflow in avi_sync()
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  ...

Conflicts:
	Changelog
	configure
	libavcodec/ptx.c
	libavcodec/ra144.c
	libavcodec/vaapi_vc1.c
	libavcodec/vc1.c
	libavcodec/version.h
	libavformat/4xm.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-11 03:42:43 +02:00
Justin Ruggles
f10524d51c ra144: use macro constants to make the code more understandable. 2011-10-10 11:38:58 -04:00
Mohamed Naufal Basheer
bcc67dffa0 Add a shift parameter to celp_lp_synthesis_filter for reuse by the G.723.1 decoder 2011-09-29 21:43:52 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
be61983d52 Make ff_add_wav static to ra144.c 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 1a88674862)
 2011-01-26 03:43:33 +01:00
Diego Elio Pettenò
1a88674862 Make ff_add_wav static to ra144.c 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 22:11:54 +01:00
Francesco Lavra
756e346798 Split do_output_subblock() into common code and decoder specific parts 
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 08:05:17 +00:00
Francesco Lavra
5ec29beeb4 Cosmetics: indent 
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 08:04:22 +00:00
Francesco Lavra
6ea6c8ebcf Add ff_ prefix to non-static functions 
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 08:03:43 +00:00
Francesco Lavra
0acaf8b0f2 Split ra144.c in common code (to be shared with the future encoder) and 
decoder.

Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23573 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 08:01:51 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Måns Rullgård
94ca624fbc Move ff_sqrt() to libavutil/intmath.h 
Originally committed as revision 22345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 21:19:56 +00:00
Francesco Lavra
7df8af6385 Fix reading beyond buffer end on RA144Context.lpc_tables. 
Patch by Francesco Lavra (francescolavra -at- interfree -dot- it)

Originally committed as revision 21796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 17:42:58 +00:00
Francesco Lavra
643bae382c Use correct context for av_log(), should prevent a crash for malformed files. 
Patch by Francesco Lavra (francescolavra at interfree dot it).

Originally committed as revision 21031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-05 16:25:41 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Måns Rullgård
09096c9fad RA144: work around gcc bug/oddity on ARM 
This should not make any difference, yet some gcc versions on ARM
produce incorrect output without this fix.

Approved by Vitor.

Originally committed as revision 17698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 23:41:39 +00:00
Vitor Sessak
8d2544bd1b Reindent after last commit 
Originally committed as revision 17678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 11:16:57 +00:00
Vitor Sessak
9e27e0d4f8 Do not read uninitialized buffer, no matter if it will be multiplied by 
zero later. This should fix some valgrind warnings and hopefully FATE
ra144 test on ARM.

Originally committed as revision 17677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 11:14:21 +00:00
Kenan Gillet
4599d22c0c Split off celp_filters.[ch] from acelp_filters.[ch] for the QCELP decoder. 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 21:29:23 +00:00
Diego Biurrun
36b3e36e00 misc spelling/wording/grammar fixes 
Originally committed as revision 15296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-11 08:13:23 +00:00
Vitor Sessak
20242eed99 Normalize triplets in gain_val_tab[][] so gain_exp_tab[] can be just an 
one-dimensional array.

Originally committed as revision 15273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:51:33 +00:00
Vitor Sessak
3e30f46f8b Pass directly variable 'a' to interp instead of evaluating it from num_blocks 
Originally committed as revision 15269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:18:29 +00:00
Vitor Sessak
b28bdce688 Simplify if() in copy_and_dup() 
Originally committed as revision 15268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:16:00 +00:00
Vitor Sessak
8022a8ebc2 Add av_cold attribute to decode_init() 
Originally committed as revision 15267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:14:37 +00:00
Vitor Sessak
c96a764c72 Cosmetics: Make the two additional units in size more clear 
Originally committed as revision 15266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:13:53 +00:00
Vitor Sessak
4fdb41a84b Test a var for overflow just after it is set 
Originally committed as revision 15223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-06 11:46:29 +00:00
Vitor Sessak
a90fbeec2a Remove useless parentheses. 
Originally committed as revision 15222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-06 11:45:10 +00:00
Vitor Sessak
b888abe1be Cosmetics: rename loop counters in eval_refl() 
Originally committed as revision 14653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 21:19:30 +00:00
Vitor Sessak
bdb34c9f5e Simplify eval_refl(): do not store a buffer value in a var when the buffer could be used directly 
Originally committed as revision 14652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 21:16:24 +00:00
Vitor Sessak
aa425ada54 Simplify eval_refl(): s/b == 0/!b/ 
Originally committed as revision 14651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 21:04:40 +00:00
Vitor Sessak
40812fdcf1 Simplify range checking in eval_refl(). Before the 
condition b == 0 could never be true, because it would
have already been caught in the previous ifs. Also the
condition b == 0x1000 could never be true (it would
triggered the return).

Originally committed as revision 14650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 21:02:56 +00:00
Vitor Sessak
d70875c81d Cosmetics: reindent 
Originally committed as revision 14649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 20:39:28 +00:00
Vitor Sessak
7e05617a5c Simplify do_output_subblock(): Remove a unneeded memcpy 
Originally committed as revision 14648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 20:38:23 +00:00
Vitor Sessak
c0f0b34bba Simplify eval_refl(): return directly when needed instead of storing the return value in a variable 
Originally committed as revision 14640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 05:24:21 +00:00
Vitor Sessak
2f1cad0e58 Simplify rms(): merge a few operations in the same statement 
Originally committed as revision 14639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 05:11:46 +00:00
Vitor Sessak
b4d46e8c06 Cosmetical simplification in t_sqrt() 
Originally committed as revision 14638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 05:08:48 +00:00
Vitor Sessak
438abdaaeb Check available size before writing in decode_frame() 
Originally committed as revision 14637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 05:06:10 +00:00
Peter Ross
fd76c37fd9 Modify all codecs to report their supported input and output sample format(s). 
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 10:47:31 +00:00
Vitor Sessak
6c9c8b06b3 Cosmetics: rename loop counter vars to i,j 
Originally committed as revision 14467 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-29 18:07:11 +00:00
Vitor Sessak
fe4a5b185f Make ff_acelp_lp_synthesis_filter() receives a pointer to the actual filter coefficients and not the pointer minus one 
Originally committed as revision 14031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-29 21:37:03 +00:00
Vitor Sessak
b83ff6c700 Update copyright 
Originally committed as revision 14030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-29 13:12:31 +00:00
Vitor Sessak
95fc77b92d Use ff_acelp_lp_synthesis_filter() instead of duplicating it 
Originally committed as revision 14029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-29 11:21:06 +00:00
Vitor Sessak
dc95111c09 Doxy comment 
Originally committed as revision 14026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-29 07:58:46 +00:00
Vitor Sessak
afb40e7277 Simplify interp() 
Originally committed as revision 13953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 21:32:34 +00:00
Vitor Sessak
74adaa3a00 More cosmetics 
Originally committed as revision 13952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 21:30:09 +00:00
Vitor Sessak
a97642680b Cosmetics 
Originally committed as revision 13951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 21:29:18 +00:00
Vitor Sessak
73cc419b27 Use lpc_coef[2] instead of lpc_coef and lpc_coef_old 
Originally committed as revision 13946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 18:38:55 +00:00
Vitor Sessak
ae70f874ba Remove unused entries from lpc_refl_cb* 
Originally committed as revision 13945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 18:13:44 +00:00
Vitor Sessak
7986199fcf Remove unused entries from energy_tab 
Originally committed as revision 13944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 18:06:30 +00:00