summaryrefslogtreecommitdiff
path: root/libavcodec/rv10.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * rv20: prevent calling ff_h263_decode_mba() with unset height/widthJanne Grunau2012-01-25
| | | | | | | | | | | | | | Prevents a crash of VLC during playback of a invalid matroska file, found by John Villamil <johnv@matasano.com>. CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * rv10: verify slice offsets against buffer sizeJanne Grunau2012-01-24
| | | | | | | | Found by John Villamil <johnv@matasano.com> in fuzzed rv20 in mkv files.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: introduce ER_MB_END and ER_MB_ERRORLuca Barbato2011-12-13
| | | | | | | | | | | | Simplify a little error resilience calls Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * error_resilience: use the ER_ namespaceLuca Barbato2011-12-13
| | | | | | | | | | | | Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * rv10: Reject slices that does not have the same type as the first oneLaurent Aimar2011-09-19
| | | | | | | | | | | | This prevents crashes with some corrupted bitstreams. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rv10/20: tell decoder to use edge emulationKostya Shishkov2011-08-17
| | | | | | | | | | | | | | | | 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>
* | Reject slices that does not have the same type than the first one in ↵Laurent Aimar2011-09-18
| | | | | | | | | | | | | | | | RV10/RV20 decoder. This prevents crashes with some corrupted bitstreams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-09
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * Saner RV1/2 initialisation and RV2 header parsing.Kostya Shishkov2011-08-08
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-29
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Remove unused variablesMans Rullgard2011-06-02
| |
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Remove some disabled printf debug cruft.Diego Biurrun2011-04-29
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-26
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Fix various unused variable warningsClément Bœsch2011-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-02
| |
* | rv10: set flags, Fixes Ticket90Michael Niedermayer2011-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-28
|/ | | | | | | | 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 d36beb3f6902b1217beda576aa18abf7eb72b03c)
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-07
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-06
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new decoder property max_lowres and do not init decoder if requested ↵Carl Eugen Hoyos2010-07-07
| | | | | | value is higher. Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add include to fix implicit declaration of ff_mpeg4_init_direct_mv andReimar Döffinger2010-01-31
| | | | | | ff_h263_encode_mba Originally committed as revision 21568 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split H263 encoder and decoder from common code.Michael Niedermayer2010-01-09
| | | | Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Store original width/height so that rv20 does not get stuck with someMichael Niedermayer2009-12-01
| | | | | | 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
* Make rv1/2 decoder use the next slice if needed.Michael Niedermayer2009-12-01
| | | | | | Fixes issue782. Originally committed as revision 20690 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct order of arguments for avcodec_check_dimensions().Michael Niedermayer2009-11-23
| | | | Originally committed as revision 20590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure avcodec_set_dimensions() is used when rv20 changes resolution.Michael Niedermayer2009-11-23
| | | | | | This should fix lowres resolution changes. Originally committed as revision 20589 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split RV10 encoder off into its own file.Diego Biurrun2009-08-03
| | | | Originally committed as revision 19579 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split RV20 encoder into its own file.Diego Biurrun2009-08-03
| | | | Originally committed as revision 19578 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodec declarations for RV10/20 from mpegvideo_enc.c to rv10.c.Diego Biurrun2009-08-03
| | | | | | It is better to keep the declarations in conditionally compiled places. Originally committed as revision 19573 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove commented-out cruft.Diego Biurrun2009-08-02
| | | | Originally committed as revision 19566 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use dprintf() instead of '#ifdef DEBUG' and av_log().Diego Biurrun2009-07-28
| | | | Originally committed as revision 19528 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove disabled function get_num().Diego Biurrun2009-07-27
| | | | | | 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
* indentMichael Niedermayer2009-05-23
| | | | Originally committed as revision 18921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix lowres with rv20.Michael Niedermayer2009-05-23
| | | | | | Fixes issue1102. Originally committed as revision 18920 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of INIT_VLC_USE_STATIC in rv10/rv20.Michael Niedermayer2009-04-11
| | | | Originally committed as revision 18436 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use INIT_VLC_USE_STATIC and not its value "1".Carl Eugen Hoyos2009-04-11
| | | | Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk