summaryrefslogtreecommitdiff
path: root/libavcodec/msrledec.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'Hendrik Leppkes2015-10-221-1/+1
|\ | | | | | | | | | | | | * commit '3496cec43304ac040d6d05f9d500a6f93cc049e7': msrle: Use AVFrame instead of AVPicture Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * msrle: Use AVFrame instead of AVPictureVittorio Giovara2015-10-211-1/+1
| | | | | | | | | | | | | | Callers always use a frame and cast it to AVPicture, change ff_msrle_decode() to accept an AVFrame directly instead. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-131-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: remove disabled code qdm2: make a table static const qdm2: simplify bitstream reader setup for some subpacket types qdm2: use get_bits_left() build: Consistently handle conditional compilation for all optimization OBJS. avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics msrle: convert MS RLE decoding function to bytestream2. x86inc improvements for 64-bit Conflicts: common.mak libavcodec/avpacket.c libavcodec/bfi.c libavcodec/msrledec.c libavcodec/qdm2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msrle: convert MS RLE decoding function to bytestream2.Ronald Bultje2012-04-111-4/+4
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | 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
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix grammar errors in documentationMåns Rullgård2010-06-301-1/+1
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Fix some typos.Diego Biurrun2009-05-221-2/+2
| | | | Originally committed as revision 18894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize out code used for MS RLE format decoding in different decoders.Kostya Shishkov2008-09-181-0/+40
Originally committed as revision 15356 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status