generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,831 Commits 24 Branches 241 Tags
Commit Graph

15650 Commits

Author SHA1 Message Date
Mans Rullgard
d341d5fd2c dnxhdenc: fixed signed multiplication overflow 
The low 32 bits of a multiplication are the same for signed
and unsigned operands.  Casting to unsigned before multiplying
is thus equivalent while avoiding signed overflow, which is
undefined by the C99 standard.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-14 20:45:22 +01:00
Michael Niedermayer
4b9e9a57ee proresdec: rename to avoid confusion 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 21:45:14 +02:00
Ronald S. Bultje
05c8f119cc proresdsp: fix function prototypes. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:34:46 +02:00
Ronald S. Bultje
f78cd0c243 prores-idct: fix overflow in c code. 
Fix the fate ref for prores-422_proxy by reverting the changes to it
in commit f492df0927c42da174edb674857670fc50abc5dc

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:34:20 +02:00
Janne Grunau
19ec283f49 prores: add missing feature warning for alpha 2011-10-14 21:07:53 +02:00
JULIAN GARDNER
0f8d77199a dvbsubdec: add version checking 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:20:00 +02:00
JULIAN GARDNER
1fc7b0ed5a dvbsubdec: handle mode change page state 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
168a5d3b3c dvbsubdec: change the top_bottom correction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
f12c7ad86d dvbsubdec: fix buf ptr in dvbsub_parse_region_segment() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
7e0f4f9d0f dvbsubdec: bottom_field_len fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
55f17d3175 dvbsubdec: fix x/y_pos checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
24fb1b64a6 dvbsubdec: outcomment debug stuff in dvbsub_parse_pixel_data_block() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
b522d2a3b7 dvbsubdec: dirty handkling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
eea064aea6 dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:12:40 +02:00
Michael Niedermayer
337496980e prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 19:48:41 +02:00
Dustin Brody
582f231142 lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-14 09:00:21 +02:00
Dustin Brody
ac90a71459 lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-14 09:00:04 +02:00
Michael Niedermayer
91eb1b1525 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  prores: add FATE tests
  id3v2: reduce the scope of some non-globally-used symbols/structures
  id3v2: cosmetics: move some declarations before the places they are used
  shorten: remove the flush function.
  shn: do not allow seeking in the raw shn demuxer.
  avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
  avformat: update AVInputFormat allowed flags
  avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
  truespeech: use sizeof() instead of hardcoded sizes
  truespeech: remove unneeded variable, 'consumed'
  truespeech: simplify truespeech_read_frame() by using get_bits()
  truespeech: decode directly to output buffer instead of a temp buffer
  truespeech: check to make sure channels == 1
  truespeech: check for large enough output buffer rather than truncating output
  truespeech: remove unneeded zero-size packet check.
  mlpdec: return meaningful error codes instead of -1
  mlpdec: remove unnecessary wrapper function
  mlpdec: only calculate output size once
  mlpdec: validate that the reported channel count matches the actual output channel count
  pcm: reduce pointer type casting
  ...

Conflicts:
	libavformat/avformat.h
	libavformat/id3v2.c
	libavformat/id3v2.h
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 03:48:22 +02:00
Michael Niedermayer
8937afd39f proresdec: set CODEC_CAP_DR1, it appears this was forgotten. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 02:18:55 +02:00
Justin Ruggles
617a51f9b7 shorten: remove the flush function. 
The shorten decoder does not support seeking.
 2011-10-13 16:31:16 -04:00
Justin Ruggles
c6ac30c84b truespeech: use sizeof() instead of hardcoded sizes 2011-10-13 16:26:00 -04:00
Justin Ruggles
6d55506c8b truespeech: remove unneeded variable, 'consumed' 
increment the 'buf' pointer instead, and consume the whole packet.
 2011-10-13 16:26:00 -04:00
Justin Ruggles
b84048935e truespeech: simplify truespeech_read_frame() by using get_bits() 2011-10-13 16:25:59 -04:00
Justin Ruggles
5e5ce70f19 truespeech: decode directly to output buffer instead of a temp buffer 2011-10-13 16:25:59 -04:00
Justin Ruggles
3e7a176759 truespeech: check to make sure channels == 1 2011-10-13 16:25:59 -04:00
Justin Ruggles
a8f8db2636 truespeech: check for large enough output buffer rather than truncating output 2011-10-13 16:25:59 -04:00
Justin Ruggles
595cf1a1aa truespeech: remove unneeded zero-size packet check. 
This is already checked in avcodec_decode_audio3()
 2011-10-13 16:25:59 -04:00
Justin Ruggles
82be06bbb3 mlpdec: return meaningful error codes instead of -1 2011-10-13 15:13:02 -04:00
Justin Ruggles
e1b8d88d52 mlpdec: remove unnecessary wrapper function 2011-10-13 15:13:02 -04:00
Justin Ruggles
37b67f1bff mlpdec: only calculate output size once 2011-10-13 15:13:02 -04:00
Justin Ruggles
caa845851d mlpdec: validate that the reported channel count matches the actual output 
channel count
 2011-10-13 15:13:02 -04:00
Mans Rullgard
b45eb9d619 pcm: reduce pointer type casting 
Making 'samples' a pointer to uint8_t simplifies the DECODE
macro and reduces the amount of type casting overall.

This also fixes some signed overflows on left shift.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-13 17:56:13 +01:00
Michael Niedermayer
072a62b50a Merge remote-tracking branch 'hexene/stagefright' 
* hexene/stagefright:
  tools/build_libstagefright: fetch android system headers and libraries
  libstagefright: reindent after previous commit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-13 18:04:02 +02:00
Mans Rullgard
f59bb3d8f3 mathops: remove undefined behaviour from sign_extend() 
This function intentionally overflows the signed range on
the left shift.  Using this type-punning avoids errors from
the overflow checker without disabling this test globally.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-13 15:40:16 +01:00
Kostya Shishkov
42feaf4070 vc1: explicitly zero interlaced mode coding variables for progressive mode 
Both v->fcm and v->field_mode are used in common code, now they won't be
reset for progressive frame after interlaced one causing writing past the
frame end for example.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-10-13 07:35:07 -07:00
Michael Niedermayer
f884ef00de Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-13 06:00:03 +02:00
Jean First
47a1d794db tiffenc: initialize forgotten avctx. 2011-10-12 18:20:18 -04:00
Michael Niedermayer
dc66951bb2 proresdsp: fix rounding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 22:18:35 +02:00
Michael Niedermayer
67dad8e7b1 proresdsp: Correct credits to point to the Author and not just the code this is based on. 
Also change Libav to FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 22:09:40 +02:00
Michael Niedermayer
96b0ddeeaa dct-test: Test ff_prores_idct_put_10_sse2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 22:08:15 +02:00
Michael Niedermayer
dfeeb85b65 dct-test: add transpose permutation support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 22:08:14 +02:00
Michael Niedermayer
370d7ef2c7 proresdsp: Optimize series of padds out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 22:08:14 +02:00
Michael Niedermayer
6398c0f7e1 proresdsp.asm: Remove useless instructions. 2011-10-12 22:07:52 +02:00
Elvis Presley
bebaf4ea1f prores: change license to LGPL, merge some parts. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 19:55:25 +02:00
Elvis Presley
b87d882578 proresdsp.asm: drop useless shifts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 19:42:53 +02:00
Elvis Presley
ef47c608be x86/proresdsp-init: add forgotten HAVE_YASM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-12 19:42:53 +02:00
Kostya Shishkov
50f9721904 vc1: more prettyprinting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-12 17:33:58 +02:00
Kostya Shishkov
94e725ca2b vc1: prettyprint some tables 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-12 17:33:58 +02:00
Kostya Shishkov
b18c68ad25 vc1: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-10-12 17:33:58 +02:00
Anton Khirnov
145f741e11 AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* 2011-10-12 16:51:16 +02:00