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

14940 Commits

Author SHA1 Message Date
Ronald S. Bultje
3a39195b1d Move x86inc.asm to libavutil/. 
This allows using it in libswscale/ also.
 2011-08-12 11:43:02 -07:00
Michael Niedermayer
9f4d37f450 ac3enc: drop common fixed/float encoder 
User applications should by now be able to support float encoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-12 17:20:57 +02:00
Reinhard Tartler
69c4bee8fa libx264: Include hint for possible values for configuring libx264 
The output of the x264 commandline tool contains the most uptodate
description of the possible values for the -preset, -tune and -profile
options.
 2011-08-12 14:09:59 +02:00
Kostya Shishkov
b86ab38137 Add weighted motion compensation for RV40 B-frames 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:58 -07:00
Kostya Shishkov
e5ec68699e RV3/4: calculate B-frame motion weights once per frame 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:23 -07:00
Kostya Shishkov
d241f51e0f Move RV3/4-specific DSP functions into their own context 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:07:15 -07:00
Dustin Brody
21d7037234 mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 16:02:18 -07:00
Dustin Brody
bac3ab13ea h264: notice memory allocation failure 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-11 15:59:07 -07:00
Michael Niedermayer
d912e449b6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ac3enc: add macros for option names to make them more understandable.
  ac3enc: fix 'channel_coupling' option to actually allow 'auto'.
  cavs: fix some crashes with invalid bitstreams
  ac3enc: clip coupling coordinates during calculation
  Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
  lavc: fix parentheses placement in avcodec_open2().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-11 20:39:20 +02:00
Michael Niedermayer
961a1a81d8 cavsdec: check run value validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-11 20:16:27 +02:00
Justin Ruggles
c766eb1ce1 ac3enc: add macros for option names to make them more understandable. 2011-08-11 11:33:32 -04:00
Justin Ruggles
9542ca9fb7 ac3enc: fix 'channel_coupling' option to actually allow 'auto'. 
Use 'auto' as the default value.
 2011-08-11 11:33:32 -04:00
Mans Rullgard
4a71da0f3a cavs: fix some crashes with invalid bitstreams 
This removes all valgrind-reported invalid writes with one
specific test file.

Fixes http://www.ocert.org/advisories/ocert-2011-002.html

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-08-10 22:35:20 +01:00
Justin Ruggles
069083a419 ac3enc: clip coupling coordinates during calculation 
This is faster than using the clip_coefficients() function. Also,
clipping the coordinates before determining reuse is better since it
will compare coordinates that are closer to their final encoded values.
 2011-08-10 17:09:24 -04:00
Justin Ruggles
d271d5b215 Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample. 
bits_per_raw_sample is used in video as well, where sample_fmt is not used.
 2011-08-10 15:40:52 -04:00
Michael Niedermayer
9f06c1c61e cavsdec: avoid possible crash with crafted input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 17:29:51 +02:00
Baptiste Coudurier
1d36fb13b0 lavc: fix parentheses placement in avcodec_open2(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-10 16:57:33 +02:00
Michael Niedermayer
a9aa88df1d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: make avcodec_init() static on next bump.
  ac3enc: remove unneeded #include
  ac3enc: restructure coupling coordinate reuse calculation
  ac3enc: allow new coupling coordinates to be sent independently for each channel.
  ac3enc: separate exponent bit counting from exponent grouping.
  h264: propagate error return values for AV_LOG_ERROR-triggering events
  aac: Don't attempt to output configure an invalid channel configuration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 16:29:51 +02:00
Clément Bœsch
51fb933dd0 timecode: move dropframe code and doxycomment it. 
This is based on the original work by Baptiste Coudurier.
 2011-08-10 16:00:32 +02:00
Clément Bœsch
5231454560 timecode: introduce timecode and honor it in MPEG-1/2. 
This is based on the original work by Baptiste Coudurier.
 2011-08-10 16:00:32 +02:00
Michael Niedermayer
6481a36010 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 13:28:36 +02:00
Anton Khirnov
7221139ba0 lavc: make avcodec_init() static on next bump. 
It's called from avcodec_register() anyway, so there's no reason for it
to be public.
 2011-08-10 12:49:57 +02:00
Justin Ruggles
d1d33e0763 ac3enc: remove unneeded #include 2011-08-09 16:44:34 -04:00
Justin Ruggles
fce33f9ead ac3enc: restructure coupling coordinate reuse calculation 2011-08-09 16:44:34 -04:00
Justin Ruggles
c3d63262fe ac3enc: allow new coupling coordinates to be sent independently for each 
channel.
 2011-08-09 16:44:34 -04:00
Justin Ruggles
d55ad59a8a ac3enc: separate exponent bit counting from exponent grouping. 
Move bit counting to the bit allocation function. Move exponent grouping to
after bit allocation. This will allow for adjustment of bandwidth parameters
during bit allocation without having to do exponent grouping multiple times.
 2011-08-09 16:28:18 -04:00
Michael Niedermayer
0d4ea7b324 lavc: bump minor for Go2Meeting codec ID 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 22:11:08 +02:00
Thierry Foucu
2a41701300 AVCodec: Add Go2Meeting codec ID 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 21:53:38 +02:00
Dustin Brody
12fe759423 h264: propagate error return values for AV_LOG_ERROR-triggering events 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-09 12:29:13 -07:00
Alex Converse
94d47382e0 aac: Don't attempt to output configure an invalid channel configuration. 2011-08-09 12:16:40 -07:00
Michael Niedermayer
3a1df52e3c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Pretty-print RV3/4 decoder source
  Saner RV1/2 initialisation and RV2 header parsing.

Conflicts:
	libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 16:32:39 +02:00
Michael Niedermayer
aae1c247b1 ra288: avoid one multiply 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 15:08:20 +02:00
Kostya Shishkov
7351eb1415 Pretty-print RV3/4 decoder source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-09 12:06:38 +02:00
Baptiste Coudurier
d5d74cf530 100l: fix parentheses placement when checking for ret < 0 2011-08-08 23:41:50 -07:00
Kostya Shishkov
9791c02733 Saner RV1/2 initialisation and RV2 header parsing. 
Old version was based on lots of guesswork which had different hacks based on
32-bit version field instead of splitting it into major/minor/micro version.
RV2 picture header parser also had a few places where it deviated from binary
decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-08 17:23:07 -07:00
Michael Niedermayer
9a5f61ac62 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: do not set pic quality if no frame is output
  libx264: add preset, tune, profile and fastfirstpass private options

Conflicts:
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-09 00:01:48 +02:00
Baptiste Coudurier
5caa2de19e libx264: do not set pic quality if no frame is output 
Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-08 14:33:09 +02:00
Baptiste Coudurier
07a227b432 libx264: add preset, tune, profile and fastfirstpass private options 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-08 14:33:09 +02:00
Michael Niedermayer
6c4e9cae52 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: fix misspelling in comment
  aac: propagate error return values for AV_LOG_ERROR-triggering events

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-07 00:32:19 +02:00
Dustin Brody
b2700a5c7c lavc: fix misspelling in comment 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-05 18:18:38 -07:00
Dustin Brody
680b1852ab aac: propagate error return values for AV_LOG_ERROR-triggering events 2011-08-05 12:35:49 -07:00
Michael Niedermayer
84a6abd954 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-04 20:59:36 +02:00
Michael Niedermayer
9e63720b4b mpegvideo.h: remove the 1 line difference to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-04 17:05:07 +02:00
Alex Converse
ad62507f32 h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME. 2011-08-03 17:56:47 -07:00
Michael Niedermayer
64160ef392 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
	libavcodec/arm/ac3dsp_armv6.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-04 01:40:29 +02:00
Diego Biurrun
fed6c90b68 cosmetics: remove some stray comments from AVCodec declarations 2011-08-03 23:31:45 +02:00
Diego Biurrun
933a6fd5a1 cosmetics: fix indentation/alignment in AVCodec declarations 2011-08-03 23:31:45 +02:00
Reimar Döffinger
99c7b51641 Abort if command offset decreases, avoids potential endless loop. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-03 20:09:53 +02:00
Carl Eugen Hoyos
324b8adca4 Fix a possible miscompilation of cabac with old (broken) compilers. 2011-08-03 13:09:42 +02:00
Carl Eugen Hoyos
eb29649cad Set bits_per_coded_sample when encoding ADPCM. 2011-08-03 11:45:33 +02:00