generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
72,824 Commits 24 Branches 241 Tags 173 MiB
21d8e2c0b5
Commit Graph

262 Commits

Author SHA1 Message Date
Michael Niedermayer
3c5fe5b527 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  wma: Clip WMA1 and WMA2 frame length to 11 bits.
  movenc: Don't require frame_size to be set for modes other than mov
  doc: Update APIchanges with info on muxer flushing
  movenc: Reindent a block
  tools: Remove some unnecessary #undefs.
  rv20: prevent calling ff_h263_decode_mba() with unset height/width
  tools: K&R reformatting cosmetics
  Ignore generated aviocat and ismindex tools.
  build: Automatically include architecture-specific library Makefile snippets.
  indeo5: prevent null pointer dereference on broken files
  pktdumper: Use usleep instead of sleep
  cosmetics: Remove some unnecessary block braces.
  Drop unnecessary prefix from *sink* variable and struct names.
  Add a tool for creating smooth streaming manifests
  movdec: Calculate an average bit rate for fragmented streams, too
  movenc: Write the sample rate instead of time scale in the stsd atom
  movenc: Add a separate ismv/isma (smooth streaming) muxer
  movenc: Allow the caller to decide on fragmentation
  libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
  movenc: Add support for writing fragmented mov files
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavfilter/Makefile
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/movenc.c
	libavformat/movenc.h
	libavformat/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-26 02:23:56 +01:00
Janne Grunau
c3e10ae412 rv20: prevent calling ff_h263_decode_mba() with unset height/width 
Prevents a crash of VLC during playback of a invalid matroska file,
found by John Villamil <johnv@matasano.com>.

CC: libav-stable@libav.org
 2012-01-25 16:18:54 +01:00
Michael Niedermayer
1d9569f9e8 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (23 commits)
  aacenc: Fix identification padding when the bitstream is already aligned.
  aacenc: Write correct length for long identification strings.
  aud: remove unneeded field, audio_stream_index from context
  aud: fix time stamp calculation for ADPCM IMA WS
  aud: simplify header parsing
  aud: set pts_wrap_bits to 64.
  cosmetics: indentation
  aud: support Westwood SND1 audio in AUD files.
  adpcm_ima_ws: fix stereo decoding
  avcodec: add a new codec_id for CRYO APC IMA ADPCM.
  vqa: remove unused context fields, audio_samplerate and audio_bits
  vqa: clean up audio header parsing
  vqa: set time base to frame rate as coded in the header.
  vqa: set packet duration.
  vqa: use 1/sample_rate as the audio stream time base
  vqa: set stream start_time to 0.
  lavc: postpone the removal of AVCodecContext.request_channels.
  lavf: postpone removing av_close_input_file().
  lavc: postpone removing old audio encoding and decoding API
  avplay: remove the -er option.
  ...

Conflicts:
	Changelog
	libavcodec/version.h
	libavdevice/v4l.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-24 22:53:59 +01:00
Janne Grunau
1d3a9e63e0 rv10: verify slice offsets against buffer size 
Found by John Villamil <johnv@matasano.com> in fuzzed rv20 in mkv files.
 2012-01-24 02:16:02 +01:00
Michael Niedermayer
3ba0bfe71f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 23:21:37 +01:00
Luca Barbato
63ccd46687 lavc: introduce ER_MB_END and ER_MB_ERROR 
Simplify a little error resilience calls

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Luca Barbato
5bf2ac2b37 error_resilience: use the ER_ namespace 
Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Michael Niedermayer
a6186f3a00 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: fix NULL reference in mov_write_tkhd_tag
  rmdec: Reject invalid deinterleaving parameters
  rv34: Fix potential overreads
  rv34: Fix buffer size used for MC of B frames after a resolution change
  rv34: Avoid NULL dereference on corrupted bitstream
  rv10: Reject slices that does not have the same type as the first one
  vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag
  vsrc_color: set output pos values to -1
  vsrc_color: add @file doxy
  vsrc_buffer: remove duplicated file description
  eval: implement not() expression
  eval: add sqrt function for computing the square root
  rmdec: use the deinterleaving mode and not the codec when creating audio packets.
  lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails

Conflicts:
	doc/eval.texi
	doc/filters.texi
	libavcodec/rv10.c
	libavfilter/vsrc_color.c
	libavformat/rmdec.c
	libavutil/avutil.h
	libavutil/eval.c
	tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-19 22:45:34 +02:00
Laurent Aimar
4a29b47186 rv10: Reject slices that does not have the same type as the first one 
This prevents crashes with some corrupted bitstreams.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-19 14:58:33 +03:00
Laurent Aimar
d788af6cf6 Reject slices that does not have the same type than the first one in RV10/RV20 decoder. 
This prevents crashes with some corrupted bitstreams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-18 00:57:49 +02:00
Kostya Shishkov
331971116d rv10/20: tell decoder to use edge emulation 
This removes out-of-edge motion compensation artifacts (easily spotted green
blocks in avplay, gray blocks in transcoding), for example here:
http://samples.libav.org/samples/real/tv_watching_t1.rm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-17 14:53:34 +02: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
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
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Michael Niedermayer
99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 05:19:30 +02:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Clément Bœsch
adba9c6352 Fix various unused variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:24:01 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Diego Biurrun
2e15305b70 Remove some disabled printf debug cruft. 2011-04-29 20:00:53 +02:00
Michael Niedermayer
cc0ac0d2cb rv10: set flags, Fixes Ticket90 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-22 16:02:23 +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
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Stefano Sabatini
e16f217ceb Use new imgutils.h API names, fix deprecation warnings. 
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 19:15:29 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use 
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 09:37:04 +00:00
Carl Eugen Hoyos
0fd0ef7947 Add new decoder property max_lowres and do not init decoder if requested value is higher. 
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:23:36 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +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
Reimar Döffinger
688621d76b Add include to fix implicit declaration of ff_mpeg4_init_direct_mv and 
ff_h263_encode_mba

Originally committed as revision 21568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-31 12:27:05 +00:00
Michael Niedermayer
fc53b6afee Split H263 encoder and decoder from common code. 
Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 14:59:06 +00:00
Michael Niedermayer
94f28061f5 Store original width/height so that rv20 does not get stuck with some 
resolution. A sample file to show a difference is at issue833 (http://airfarce.com/video/000211fh.rm)

Originally committed as revision 20691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 22:30:03 +00:00
Michael Niedermayer
e7e578b73c Make rv1/2 decoder use the next slice if needed. 
Fixes issue782.

Originally committed as revision 20690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 21:10:37 +00:00
Michael Niedermayer
e026902a62 Correct order of arguments for avcodec_check_dimensions(). 
Originally committed as revision 20590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 19:24:17 +00:00
Michael Niedermayer
4687f908c6 Make sure avcodec_set_dimensions() is used when rv20 changes resolution. 
This should fix lowres resolution changes.

Originally committed as revision 20589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 19:22:19 +00:00
Diego Biurrun
d8c2f8f71f Split RV10 encoder off into its own file. 
Originally committed as revision 19579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-03 23:22:46 +00:00
Diego Biurrun
b6767d6d9b Split RV20 encoder into its own file. 
Originally committed as revision 19578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-03 23:07:08 +00:00
Diego Biurrun
f7e1353523 Move AVCodec declarations for RV10/20 from mpegvideo_enc.c to rv10.c. 
It is better to keep the declarations in conditionally compiled places.

Originally committed as revision 19573 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-03 15:23:53 +00:00
Diego Biurrun
e4d65ba590 Remove commented-out cruft. 
Originally committed as revision 19566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-02 15:10:03 +00:00
Diego Biurrun
ff736f84e2 Use dprintf() instead of '#ifdef DEBUG' and av_log(). 
Originally committed as revision 19528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-28 12:50:32 +00:00
Diego Biurrun
ce6636b1c1 Remove disabled function get_num(). 
It is small and has been disabled and unused for more than four years.

Originally committed as revision 19520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-27 16:10:38 +00:00
Michael Niedermayer
77bc343a40 indent 
Originally committed as revision 18921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-23 23:02:33 +00:00
Michael Niedermayer
216fb60dff Fix lowres with rv20. 
Fixes issue1102.

Originally committed as revision 18920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-23 22:59:35 +00:00
Michael Niedermayer
76ac719888 Get rid of INIT_VLC_USE_STATIC in rv10/rv20. 
Originally committed as revision 18436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 13:53:34 +00:00
Carl Eugen Hoyos
e161e007be Use INIT_VLC_USE_STATIC and not its value "1". 
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 11:47:15 +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
Michael Niedermayer
09a9b45e4f Add and use ff_pixfmt_list_420. 
Originally committed as revision 17564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 18:27:52 +00:00
Michael Niedermayer
152714e1f1 Fix unknown header 10001000 / http://samples.mplayerhq.hu/real/VC-RV10/thankyou.rm / issue809 
Originally committed as revision 16967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 03:01:17 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Laurent Aimar
ac52613c16 Check extradata is large enough. 
Patch by Laurent Aimar fenrir \:/ via ecp fr

Originally committed as revision 16157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-15 23:01:54 +00:00
Diego Biurrun
910f02a054 spelling cosmetics 
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:28:58 +00:00
Diego Biurrun
f544a5fc84 Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific 
CONFIG_FOO_ENCODER conditionals where appropriate.

Originally committed as revision 15174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 12:33:21 +00:00
Ramiro Polla
6647ab80e3 bitstream: move put_sbits() from flacenc.c to bitstream.h and use it 
throughout libavcodec.

Originally committed as revision 14204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 14:27:48 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 22:39:51 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage 
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:31:02 +00:00
Michael Niedermayer
16db358520 const 
Originally committed as revision 11741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 14:08:35 +00:00
Kostya Shishkov
63e6c1766c indentation after last commit 
Originally committed as revision 10826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-21 17:23:07 +00:00
Kostya Shishkov
dd55d4a315 Make RV10/20 decoder work with new frame format 
Originally committed as revision 10825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-21 17:22:37 +00:00
Alex Beregszaszi
7ae7300ee3 use skip_bits where appropriate 
Originally committed as revision 10004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:57:36 +00:00
Alex Beregszaszi
5fc32c275e use get_bits1(..) instead get_bits(.., 1) 
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:13:31 +00:00
Roman Shaposhnik
c21f308e77 * Getting rid of the use of GCC language extensions 
Originally committed as revision 9531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 03:16:59 +00:00
Reimar Döffinger
284ad8a4f0 Check dimensions to avoid division by zero due to invalid new dimensions. 
Partially fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=773.

Originally committed as revision 8321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 09:16:11 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Michael Niedermayer
0d415b2dd7 seems only 3 bits are used for the number of resolutions, some rv30 files have this set to 10 even though there are just 2 resolutions in the extradata 
Originally committed as revision 6395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 16:00:27 +00:00
Michael Niedermayer
f457965c20 ignore sub_id 
Originally committed as revision 6392 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 11:45:09 +00:00
Michael Niedermayer
fb3d155c31 big endian fix 
Originally committed as revision 6391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 11:35:14 +00:00
Michael Niedermayer
113533a582 support resolution switching, fixes rv20errors.rm 
Originally committed as revision 6390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 11:31:15 +00:00
Michael Niedermayer
78a5ec27aa simplify 
Originally committed as revision 6389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-29 23:57:03 +00:00
Michael Niedermayer
6d3124961b fix rv20 b frames (broke since r5264 Mon Apr 3 07:52:24 2006 UTC 2x faster ff_mpeg4_set_direct_mv) 
Originally committed as revision 6388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-29 23:34:42 +00:00
Michael Niedermayer
c38a29a448 fix decoding of bastard3.rm (ver=0x10003001 ver0=0x9000000) 
Originally committed as revision 6349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-26 22:23:33 +00:00
Michael Niedermayer
e2887363e1 fix decoding of bastard1.rm (rv ver=0x10003001 ver0=0x8000000) 
Originally committed as revision 6346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-26 20:24:13 +00:00
Wolfgang Scherer
60dfd14778 Fix SIGSEGV in rv10-null-pointer-500k.rm. 
patch by Wolfgang Scherer, Wolfgang__ . __Scherer__ @ __gmx__ . __de

Originally committed as revision 5293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-15 12:52:01 +00:00
Michael Niedermayer
37921ffde8 fix "concealing 0 DC, 0 AC, 0 MV errors" bug 
Originally committed as revision 5290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-14 20:45:08 +00:00
Michael Niedermayer
5430b070a8 cleanup picture / debug output code 
Originally committed as revision 5140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-10 20:40:52 +00:00
Steve L'Homme
267f7edcd1 (f)printf --> av_log conversion 
taken from a patch by Steve L'Homme

Originally committed as revision 5127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-08 11:43:10 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Michael Niedermayer
473a200d93 error concealment fix 
Originally committed as revision 4543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-01 00:15:12 +00:00
Michael Niedermayer
644a92626a PIX_FMT_NONE and related fixes 
Originally committed as revision 4161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-25 18:29:06 +00:00
Michael Niedermayer
dee6dde669 avoid unneeded clear_blocks() 
Originally committed as revision 4157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-25 00:57:48 +00:00
Matthieu Castet
f9e0f2a206 extract from the subid the options 
instead of doing a case where we should add lot's of versions.
patch by (matthieu castet {castet.matthieu free fr)

Originally committed as revision 4156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-25 00:10:11 +00:00
Michael Niedermayer
9786bd4d94 fixing broken_rv20_1mb_.rm 
Originally committed as revision 4155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 22:08:31 +00:00
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped") 
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 17:21:11 +00:00
Michael Niedermayer
4719d1f381 Video-Galileo_small.rm fix by (matthieu castet # castet.matthieu free fr) 
Originally committed as revision 4149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-21 21:27:03 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>) 
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-24 19:08:50 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder 
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 18:09:06 +00:00
Michael Niedermayer
f6d5112387 fixing decoding of http://mplayerhq.hu/~atmos4/ffrv20-crashing-atmos.rm 
Originally committed as revision 3808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-05 02:36:10 +00:00
Michael Niedermayer
74679f5c1c another try at fixing rv20 ... 
Originally committed as revision 3749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-13 11:41:59 +00:00
Michael Niedermayer
d0271e8a3a rv20 encoding 
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-07 13:14:37 +00:00
Michael Niedermayer
bc17df09d4 seeking in rm 
Originally committed as revision 3737 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 22:44:03 +00:00
Michael Niedermayer
18ade9543f rv10 thread safety fix / rv10 ffplay fix 
Originally committed as revision 3733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 17:21:17 +00:00
Michael Niedermayer
423962dc01 next try at fixing rv20 decoding 
Originally committed as revision 3728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-05 23:21:39 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>) 
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-27 18:10:06 +00:00
Michael Niedermayer
9993064eec fixing rv20201002 
Originally committed as revision 3694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-19 18:19:36 +00:00
Michael Niedermayer
35ef76b51c rv20103001 support 
Originally committed as revision 3692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-19 16:57:47 +00:00
Michael Niedermayer
9b434875f1 fix one file, will probably break some others but i cant find any samples which need this ... 
Originally committed as revision 3371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-02 13:03:58 +00:00
Michael Niedermayer
4df8ca9df2 warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-25 18:07:25 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup 
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 14:37:16 +00:00
Michael Niedermayer
137c8468e8 unify table indexing (motion_val,dc_val,ac_val,coded_block changed) 
minor +-1 bugfix

Originally committed as revision 3016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-16 01:01:45 +00:00
Michael Niedermayer
a3c22fbca6 rv20 (0x20201002) support 
Originally committed as revision 2948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-02 21:04:56 +00:00
Michael Niedermayer
3edcacde04 init cleanup 
Originally committed as revision 2899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-16 16:11:29 +00:00
Michael Niedermayer
fddae1c30f skip b frames before first i frame 
Originally committed as revision 2829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 02:25:19 +00:00
Michael Niedermayer
d705e4a6bb (f)printf() is disallowed in libavcodec, compilation will fail now if its used, except that codecs which where added after the printf->av_log change which did ignore av_log() and used prinf are now silent and wont print anything, they should be changed to use av_log, i could do that, but its better if the orginal developer decides which AV_LOG level each message should get 
Originally committed as revision 2806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-22 00:31:19 +00:00
Michael Niedermayer
8a36717afc rv10/obmc fixes 
Originally committed as revision 2768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-09 15:23:35 +00:00
Michael Niedermayer
303e50e65b closed gop support & flags2 as all bits in flags are used 
and a few minor things i forgot to commit ...

Originally committed as revision 2718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-22 19:48:28 +00:00
Michael Niedermayer
8e78482542 rv20 mv prediction in b frames fix 
Originally committed as revision 2712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-18 02:59:01 +00:00
Michael Niedermayer
8f2ab83318 copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise 
Originally committed as revision 2686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-10 16:04:55 +00:00
Wolfgang Hesseler
0c9bbaec60 motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>) 
Originally committed as revision 2636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-30 02:12:12 +00:00
Michael Niedermayer
8135f8df52 rv20 / h263 b frame fix 
Originally committed as revision 2628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-21 20:06:59 +00:00
Michael Niedermayer
bed1707c9c fix crash 
Originally committed as revision 2627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-19 00:47:36 +00:00
Michael Niedermayer
7f9b37b08e 10l (uninitialized var ...) 
Originally committed as revision 2589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-10 16:20:28 +00:00
Michael Niedermayer
ba58dabc5c h263 slice structured mode 
slice cleanup

Originally committed as revision 2568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-07 01:33:45 +00:00
Michael Niedermayer
ac49f3efac set has_b_frames correctly, fixes rv20 dr1 with mplayer 
Originally committed as revision 2563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-04 19:15:37 +00:00
Michael Niedermayer
b40cd4e0e4 rv20 (h263) b frame decoding support 
Originally committed as revision 2561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-04 18:34:47 +00:00
Michael Niedermayer
554daa2402 cleanup 
Originally committed as revision 2558 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-03 16:47:17 +00:00
Michael Niedermayer
332f9ac4e3 h263 loop filter 
fixed h263 modified quantization
CODEC_FLAG_OBMC

Originally committed as revision 2549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-01 15:23:14 +00:00
Michael Niedermayer
248a1aa54c 4th frame type ... 
Originally committed as revision 2547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-30 19:04:56 +00:00
Michael Niedermayer
473c7582a5 rv20 sub_id == 0x20200002 support 
Originally committed as revision 2546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-30 18:08:35 +00:00
Michael Niedermayer
43dc0bfd2e cleanup 
Originally committed as revision 2545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-30 17:30:18 +00:00
Michael Niedermayer
40a12840b8 rv10 fix 
Originally committed as revision 2544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-30 17:22:51 +00:00
Michael Niedermayer
68b94c354d rv20 decoder 
Originally committed as revision 2543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-30 14:35:35 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-03 13:26:22 +00:00
Michael Niedermayer
7d1c3fc1d6 rate distortion mb decision support 
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c

Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-29 02:09:12 +00:00
James Stembridge
ebc51331a8 set pix_fmt in rv10 patch by (James Stembridge <jstembridge at users dot sourceforge dot net>) 
Originally committed as revision 1909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-26 21:40:58 +00:00
Michael Niedermayer
983e3246b7 per file doxy 
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-06 11:32:04 +00:00
Wolfgang Hesseler
7604246d1a more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes) 
Originally committed as revision 1588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-16 23:05:38 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Michael Niedermayer
68f593b484 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops 
Originally committed as revision 1486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-21 17:34:12 +00:00
Michael Niedermayer
492cd3a920 AVVideoFrame -> AVFrame 
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-09 12:03:43 +00:00
Michael Niedermayer
1e491e29c2 cleanup 
adding AVVideoFrame
 moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
 removing obsolete variables in AVCodecContext
 skiping of MBs in b frames
 correctly initalizing AVCodecContext
 picture buffer cleanup

Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-04 10:04:03 +00:00
Zdenek Kabelac
eb4b3dd3c3 * using DSPContext - so each codec could use its local (sub)set of CPU extension 
Originally committed as revision 1194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-11 09:40:17 +00:00
Michael Niedermayer
d6db1c9c6a handle direct rendering buffer allocation failure 
Originally committed as revision 1075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-27 00:02:23 +00:00
Michael Niedermayer
4d2858deac better/cleaner error resilience (done in a 2nd pass after decoding) 
h263/mpeg4 out of order slice decoding

Originally committed as revision 1030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-13 13:16:04 +00:00
Michael Niedermayer
144f062500 rv10 cleanup (de)muxer still needs to be cleaned up (still searching volunteer for that ;) ) 
Originally committed as revision 988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-01 19:29:10 +00:00
Michael Niedermayer
4c2bc159bd fixing rv10, this isnt the cleanest solution (parsing the packet header in the codec & creating it in the muxer) but it was that way before things broke, and its the simplest solution 
Originally committed as revision 986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-30 21:36:43 +00:00
Michael Niedermayer
0b61920aa7 fixing rv10 encoding (ffmpeg can at least decode its own rv10 files now) 
Originally committed as revision 907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-05 13:23:11 +00:00
Michael Niedermayer
9db99069bd fixing segfault 
Originally committed as revision 903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-03 20:15:34 +00:00
Michael Niedermayer
255b3ac27d use extradata for h263_long_vector mode detection 
Originally committed as revision 876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-08-28 21:47:28 +00:00
Michael Niedermayer
68bd11f5de working around undefined behavior of get-vlc if the vlc s invalid 
more debug output by default for errors (so we can see immedeatly whats wrong on bugreports)
guess long_vectors mode

Originally committed as revision 874 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-08-28 12:23:12 +00:00