aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/nuv.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-071-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec_asf: Set the no_resync_search option for the chained asf demuxer asfdec: Add an option for not searching for the packet markers cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others cosmetics: Align codec declarations cosmetics: Convert mimic.c to utf-8 avconv: remove an unused function parameter. avconv: remove now pointless variables. avconv: drop support for building without libavfilter. nellymoserenc: fix crash due to memsetting the wrong area. libavformat: Only require first packet to be known for audio/video streams avplay: Don't try to scale timestamps if the tb isn't set Conflicts: Changelog configure ffmpeg.c libavcodec/aacenc.c libavcodec/bmpenc.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/ffv1.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/libopenjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/pamenc.c libavcodec/pgssubdec.c libavcodec/pngenc.c libavcodec/qtrleenc.c libavcodec/rawdec.c libavcodec/sgienc.c libavcodec/tiffenc.c libavcodec/v210dec.c libavcodec/wmv2dec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Align codec declarationsMartin Storsjö2012-04-061-1/+1
| | | | | | | | | | | | | | Also break some long lines, remove codec function placeholder comments and add spaces in sample/pixel format lists. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-161-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtjpeg: Add ff_ prefix to nonstatic symbolsMartin Storsjö2012-02-151-4/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * dsputil: Add ff_ prefix to the dsputil*_init* functionsMartin Storsjö2012-02-151-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (42 commits) swscale: fix signed overflow in yuv2mono_X_c_template snow: fix integer overflows svq1enc: remove stale altivec-related hack snow: fix signed overflow in byte to 32-bit replication adx: rename ff_adx_decode_header() to avpriv_adx_decode_header() avformat: add CRI ADX format demuxer adx: add an ADX parser. adx: move header decoding to ADX common code adx: calculate the number of blocks in a packet adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES adx: check for unsupported ADX formats adx: simplify encoding by using put_sbits() adx: calculate correct LPC coeffs adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow adx: simplify adx_decode() by using get_sbits() to read residual samples adx: fix the data offset parsing in adx_decode_header() adx: remove unneeded post-decode channel interleaving adx: validate header values adx: cosmetics: general pretty-printing and comment clean-up adx: remove useless comments ... Conflicts: Changelog libavcodec/cook.c libavcodec/fraps.c libavcodec/nuv.c libavcodec/pthread.c libavcodec/version.h libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nuv: check per-frame header for validity.Reimar Döffinger2011-11-261-3/+3
| | | | | | | | | | | | | | Since it contains dimensions parsing an invalid one has rather annoying effects. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * nuv: use FFALIGN.Reimar Döffinger2011-11-261-2/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | nuv: do not use data not initialized by LZO decompression.Reimar Döffinger2011-11-051-1/+1
| | | | | | | | | | | | | | This fixes visible corruption in the incomplete last frame of the FATE sample. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | nuv: Fix combination of size changes and LZO compression.Reimar Döffinger2011-11-051-12/+26
| | | | | | | | | | | | | | | | | | There were multiple issues, for example might we have to re-run the decompression when the size of the buffer increased, we should always use a decompression buffer large enough for the header (so we do not get stuck when the size is too small). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Check NUV per-frame header for validity.Reimar Döffinger2011-11-051-2/+2
| | | | | | | | | | | | | | Since it contains dimensions parsing an invalid one has rather annoying effects. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Use FFALIGN.Reimar Döffinger2011-11-051-2/+2
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-9/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-291-9/+8
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-241-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Consistently use '@' instead of '\' for Doxygen markup.Diego Biurrun2011-06-241-7/+7
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Use av_fast_malloc instead of av_realloc.Reimar Döffinger2011-01-241-2/+1
| | | | | | | | | | | | This should be faster, is less code and fixes issue 2524 (allocation error would lead to crash). (cherry picked from commit e7b95918fca1c3d057d35f77ba58ee2d00d03151)
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-1/+1
| |
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-1/+1
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
| | | | | | | | | | | | | | | | 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 av_fast_malloc instead of av_realloc.Reimar Döffinger2011-01-241-2/+1
|/ | | | | This should be faster, is less code and fixes issue 2524 (allocation error would lead to crash).
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-071-1/+1
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-061-1/+2
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify: reget_buffer behaves exactly like get_buffer if the buffer wasReimar Döffinger2009-09-101-1/+1
| | | | | | previously released, so no extra condition is necessary. Originally committed as revision 19808 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-071-1/+3
| | | | | | | | | | | 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
* Set AVFrame.reference correctly for nuv decoder.Reimar Döffinger2009-03-041-1/+1
| | | | Originally committed as revision 17807 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change a bunch of codec long_names to be more consistent and descriptive.Diego Biurrun2009-03-021-1/+1
| | | | Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to LZO stuff and thus make it officially part of the public API.Reimar Döffinger2009-02-021-2/+2
| | | | | | Keep lzo1x_decode until the next major version bump for binary compatibility. Originally committed as revision 16946 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix nuv decoder to use reget_buffer for non-keyframes and correctlyReimar Döffinger2008-09-051-6/+16
| | | | | | identify non-keyframe RTJPEG frames. Originally committed as revision 15217 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini2008-06-121-1/+1
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-3/+2
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long names to many AVCodec declarations.Stefano Sabatini2008-04-271-0/+1
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-211-2/+2
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constMichael Niedermayer2008-02-011-2/+2
| | | | Originally committed as revision 11734 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constsMichael Niedermayer2008-02-011-1/+1
| | | | | | I have underestimated this a little, and these are just some ... Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dsputil must be initialized before calling rtjpeg init.Reimar Döffinger2007-09-091-1/+1
| | | | Originally committed as revision 10463 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Properly handle nuv file with changing resolutionReimar Döffinger2007-09-091-27/+47
| | | | Originally committed as revision 10448 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure rtjpeg quality is a valid valueReimar Döffinger2007-09-091-0/+1
| | | | Originally committed as revision 10444 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix extreme stupidity: buffer size check must of course be before buffer use!Reimar Döffinger2007-09-091-2/+2
| | | | Originally committed as revision 10443 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l, add check forgotten in last commitReimar Döffinger2007-09-091-0/+4
| | | | Originally committed as revision 10442 to svn://svn.ffmpeg.org/ffmpeg/trunk
* First ugly and slow attempt to fix nuv files with extra frameheaderReimar Döffinger2007-09-091-0/+41
| | | | | | and per-frame rtjpeg quality Originally committed as revision 10441 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify nuv: factor out LZO decompressionReimar Döffinger2007-09-091-14/+9
| | | | Originally committed as revision 10440 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove redundant #inclusion of common.h, avcodec.h already #includes it.Diego Biurrun2007-05-101-1/+0
| | | | Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk