summaryrefslogtreecommitdiff
path: root/libavcodec/flashsv.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-121-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: return more meaningful error valueDiego Biurrun2011-10-111-1/+1
| |
| * flashsv: fix typo in av_log() messageDiego Biurrun2011-10-111-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-231-12/+295
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: avoid a branch in 10-bit decode_dct_block() H.264: Add optimizations to predict x86 assembly. riff: Add mpgv MPEG-2 fourcc add Flash Screen Video 2 decoder Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * add Flash Screen Video 2 decoderKostya Shishkov2011-07-221-12/+295
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-161-34/+43
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) arm: remove disabled function dct_unquantize_h263_inter_iwmmxt() Remove commented-out call to non-existing function print_pow1(). Do not decode RV30 files if the extradata is too small flashsv: split flashsv_decode_block() off from flashsv_decode_frame(). ppc: remove disabled code libspeexdec: Drop const qualifier to silence compiler warning. libopenjpeg: Drop const qualifier to silence compiler warning. alac: Remove unused dummy code. Remove unused structs and tables. vaapi: do not assert on value read from input bitstream flashsvenc: replace bitstream description by a link to the specification flashsvenc: drop unnecessary cast flashsvenc: improve some variable names and fix corresponding comments flashsvenc: merge two consecutive if-conditions flashsvenc: merge variable declarations and initializations flashsvenc: convert some debug av_log() to av_dlog() flashsvenc: whitespace cosmetics flashsvenc: drop some unnecessary parentheses flashsvenc: fix some comment typos aacps: skip some memcpy() if src and dst would be equal ... Conflicts: libavcodec/vaapi_mpeg2.c libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: split flashsv_decode_block() off from flashsv_decode_frame().Diego Biurrun2011-07-161-34/+43
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-091-20/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) mp3enc: write a xing frame containing number of frames in the file lavf: update AVStream.nb_frames when muxing. ffmpeg: remove unused variables from InputStream. doc: update ffmpeg -ar and -ac documentation to reflect reality. ffmpeg: remove pointless if (nb_input_files) ffmpeg: merge input_files_ts_offset into input_files. ffmpeg: merge input_codecs into input_streams. ffmpeg: drop AV prefixes from struct names. ffmpeg: deprecate loop_input and loop_output options gif: add loop private option. img2: add loop private option. AVOptions: in av_opt_find() don't return named constants unless unit is specified. x11grab: replace undocumented nomouse hackery with a private option. dict: extend documentation. lls: whitespace cosmetics docs: Use proper markup for a literal command line option docs: Remove a remark that isn't relevant any longer docs: Explain how to regenerate import libraries with MSVC tools docs: Mention that libraries for MSVC can be built with a cross compiler docs: Remove old docs that mention setting up a build environment with lib.exe ... Conflicts: doc/ffmpeg.texi doc/general.texi ffmpeg.c libavcodec/Makefile libavcodec/dnxhddata.c libavformat/mp3enc.c libavformat/utils.c libavutil/Makefile tests/copycooker.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: inline copy_region() into flashsv_decode_frame()Diego Biurrun2011-07-081-16/+11
| |
| * flashsv: improve some variable namesDiego Biurrun2011-07-071-7/+7
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-061-54/+42
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffserver: remove unused variable. Remove unused and outdated TODO file. gitignore: Drop individual .d ignore; it is already covered by a wildcard. lavf: deprecate AVStream.quality. bink: pass Bink version to audio decoder through extradata instead of codec_tag. libpostproc: Remove disabled code. flashsv: improve some comments and fix some wrong ones flashsv: Eliminate redundant variable indirection. flashsv: set reference frame type to full frame flashsv: replace bitstream description by a link to the specification flashsv: convert a debug av_log into av_dlog flashsv: simplify condition flashsv: return more meaningful error values flashsv: cosmetics: break some overly long lines flashsv: cosmetics: drop some unnecessary parentheses swscale: amend documentation to mention use of native depth for scaling. eval: add missing comma to tests. eval: fix memleak. H.264: make loopfilter bS const where applicable Conflicts: libavcodec/binkaudio.c libavformat/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: improve some comments and fix some wrong onesDiego Biurrun2011-07-061-6/+6
| |
| * flashsv: Eliminate redundant variable indirection.Diego Biurrun2011-07-061-3/+2
| | | | | | | | | | As a positive side-effect, this gets rid of the following warning: libavcodec/flashsv.c:190:38: warning: assignment discards ‘const’ qualifier from pointer target type
| * flashsv: set reference frame type to full frameDiego Biurrun2011-07-061-1/+1
| |
| * flashsv: replace bitstream description by a link to the specificationDiego Biurrun2011-07-061-19/+3
| | | | | | | | | | | | An official specification now exists and it is both more detailed and easier to understand than the incomplete notes available here. Also remove ideas on how to implement an encoder; these notes are already present in the encoder.
| * flashsv: convert a debug av_log into av_dlogDiego Biurrun2011-07-061-4/+3
| |
| * flashsv: simplify conditionDiego Biurrun2011-07-061-3/+2
| |
| * flashsv: return more meaningful error valuesDiego Biurrun2011-07-061-2/+2
| |
| * flashsv: cosmetics: break some overly long linesDiego Biurrun2011-07-061-8/+15
| |
| * flashsv: cosmetics: drop some unnecessary parenthesesDiego Biurrun2011-07-061-11/+11
| |
* | lavc: set defaults in internal codec framesStefano Sabatini2011-05-071-0/+1
| | | | | | | | | | | | | | | | | | This is required specifically for setting frame->format to -1, otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading the format from the output decoded frame will get misled. In particular fix regressions occurring with the pending vsrc_buffer patch.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-051-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: K&R cosmeticsDiego Biurrun2011-05-041-2/+2
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-261-73/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: graphparser: add a NULL check on the argument passed to strstr setdar: prefer "sar" over "par" in log info message fade: fix draw_slice() check on fade->factor value fade: make draw_slice() chroma check against planes 1 and 2 win32: include the correct header in cmdutils.c ac3: fix memleak in fixed-point encoder flashsv: Return more meaningful error values. flashsv: Employ explicit AVCodec struct initializers. read AVI palette from the end of extradata cosmetics: K&R coding style and more whitespace for Flash Screen Video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: Return more meaningful error values.Diego Biurrun2011-04-251-1/+1
| |
| * flashsv: Employ explicit AVCodec struct initializers.Diego Biurrun2011-04-251-11/+10
| |
| * cosmetics: K&R coding style and more whitespace for Flash Screen VideoDiego Biurrun2011-04-251-61/+54
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove a few if (p) av_free(p) formsClément Bœsch2011-02-031-4/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * 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>
* | Remove a few if (p) av_free(p) formsClément Bœsch2011-02-041-4/+2
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 437fb1c87d7b4b0730db97d0858b4f39fffff2a9)
* | 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)
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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-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
* Fixed buffer overread in flashsv decoder.Laurent Aimar2010-03-041-0/+7
| | | | Originally committed as revision 22210 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not release the AVFrame when using reget_buffer in flashsv.Benjamin Larsson2009-09-131-3/+0
| | | | Originally committed as revision 19834 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use reget_buffer instead of get_buffer. Fixes issue1367.Benjamin Larsson2009-09-101-4/+4
| | | | | | Patch by jarkko.palviainen.sesca.com. Originally committed as revision 19814 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark all pix_fmts and supported_framerates compound literals as const.Reimar Döffinger2009-09-061-1/+1
| | | | | | Makes no difference for gcc but at least icc can put them in .rodata then. Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 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
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* flashsv: use skip_bits_long() where requiredMåns Rullgård2008-11-241-1/+1
| | | | | | | skip_bits(gb, n) with n > 17 doesn't work with all bitstream readers. Switch to skip_bits_long() instead. Originally committed as revision 15930 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
* Replace some occurrences of -1 with PIX_FMT_NONE.Carl Eugen Hoyos2008-05-111-1/+1
| | | | | | Fixes icc warning #188: enumerated type mixed with another type Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Long name spelling fixesBenjamin Larsson2008-05-021-1/+1
| | | | Originally committed as revision 13038 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
* typo: occured --> occurredDiego Biurrun2008-03-221-1/+1
| | | | Originally committed as revision 12549 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-1/+1
| | | | Originally committed as revision 11726 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
View Lorry Controller Status