summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-4/+0
| |
| * mjpegdec: K&R formatting cosmeticsDaniel Huang2012-01-081-683/+726
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Add and use av_fast_padded_malloc.Reimar Döffinger2012-01-171-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same as av_fast_malloc but uses av_mallocz and keeps extra always-0 padding. This does not mean the memory will be 0-initialized after each call, but actually only after each growth of the buffer. However this makes sure that a) all data anywhere in the buffer is always initialized b) the padding is always 0 c) the user does not have to bother with adding the padding themselves Fixes another valgrind warning about use of uninitialized data, this time with fate-vsynth1-jpegls. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | ljpegdec: reset restart interval for each plane of a non interleaved file.Michael Niedermayer2012-01-151-0/+2
| | | | | | | | | | | | Fixes Ticket907 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | thp: Fix handling of restart intervalMichael Niedermayer2012-01-151-0/+6
| | | | | | | | | | | | Fixes Ticket903 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix decoding of progressive jpgs with unusual pixel formats.Carl Eugen Hoyos2012-01-121-22/+33
| | | | | | | | Fixes ticket #892.
* | ljpegdec: Fix the left column of rgb24 decodingMichael Niedermayer2012-01-101-1/+1
| | | | | | | | | | | | Fixes Ticket894 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg: update whitespaces to qataranonymous2012-01-101-637/+674
| |
* | ljpegdec: Support MCU in ljpeg_decode_yuv_scan()Michael Niedermayer2012-01-091-8/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ljpegdec: support non zero MCU for RGB. 2nd tryMichael Niedermayer2012-01-081-2/+12
| | | | | | | | | | | | | | Fixes Ticket875 Compared to patch 1 this fixes a bright line at the right side. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ljpeg: Fix bits != 8 or 16 supportMichael Niedermayer2012-01-071-0/+4
| | | | | | | | | | | | Fixes 2nd half of Ticket889 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-061-12/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) ipmovie: do not read audio packets before the codec is known truemotion2: check size before GetBitContext initialisation avio: Only do implicit network initialization for network protocols avio: Add an URLProtocol flag for indicating that a protocol uses network adpcm: ADPCM Electronic Arts has always two channels matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc() fate: Add missing reference file from 9b4767e4. mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions. 4xm: Prevent buffer overreads. mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan vp3: add fate test for non-zero last coefficient vp3: fix streams with non-zero last coefficient swscale: remove unused U/V arguments from yuv2rgb_write(). timer: K&R formatting cosmetics lavf: cosmetics, reformat av_read_frame(). lavf: refactor av_read_frame() to make it easier to understand. Report an error if pitch_lag is zero in AMR-NB decoder. Revert "4xm: Prevent buffer overreads." 4xm: Prevent buffer overreads. 4xm: pass the correct remaining buffer size to decode_i2_frame(). ... Conflicts: libavcodec/4xm.c libavcodec/mjpegdec.c libavcodec/truemotion2.c libavformat/ipmovie.c libavformat/mov_chan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scanJanne Grunau2012-01-051-8/+16
| | | | | | | | | | | | | | Check explicitly if enough bits are left to prevent an infinite loop when the bitstream buffer is not followed by zero-padding. Based on patches by Michael Niedermayer <michaelni@gmx.at>.
* | Support decoding of some unusual jpeg samples.Carl Eugen Hoyos2012-01-061-11/+38
| | | | | | | | | | | | Avoid unsupported pix_fmts by upscaling chroma. Fixes ticket #878.
* | jpegdec: Fix vlc table check for progressive jpegs.Michael Niedermayer2012-01-041-1/+1
| | | | | | | | | | | | Fixes Ticket834 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpegdec: non interleaved rgb ljpeg support.Michael Niedermayer2012-01-021-7/+8
| | | | | | | | | | | | Fixes Ticket856 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpegdec: 9-16 bit yuv/gray ljpeg support.Michael Niedermayer2012-01-021-9/+50
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpegdec: Only enable rgb mode when there are 3 components.Michael Niedermayer2012-01-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ljpegdec: fix point transform injection.Michael Niedermayer2011-12-301-1/+1
| | | | | | | | | | | | Fix Ticket842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding yuv442 and yuv421 jpeg images.Carl Eugen Hoyos2011-12-271-0/+28
| | | | | | | | Fixes ticket #787.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-231-6/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Don't stick the QuickTime field ordering atom in extradata.Alex Converse2011-12-211-6/+3
| | | | | | | | | | | | The 'fiel' atoms can be found in H.264 tracks clobbering the extradata. MJPEG supports non field based extradata, and this data should be preserved when copying.
* | jpegdec: check return value of mjpeg_decode_dc()Michael Niedermayer2011-12-151-6/+17
| | | | | | | | | | | | Fixes Ticket754 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.Michael Niedermayer2011-12-141-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-121-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix a bunch of common typos.Diego Biurrun2011-12-111-3/+3
| |
* | Decode RGB ljpeg to RGB24.Carl Eugen Hoyos2011-12-081-10/+10
| | | | | | | | No alpha channel is decoded, the output used to be completely transparent.
* | jpeg: rgb supportMichael Niedermayer2011-11-021-0/+7
| | | | | | | | | | | | | | Fixes Ticket297 Based on a patch by Carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-231-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays VC1: restore mistakenly removed code twinvq: check output buffer size before decoding twinvq: return an error when the packet size is too small lavf: export some forgotten symbols with non-av prefixes. swscale: update altivec yuv2planeX asm to new per-plane API. swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware. yuv2planeX10 SIMD swscale: decide whether to use yuv2plane1/X on a per-plane basis. swscale: reintroduce full precision in 16-bit output. Split up yuv2yuvX functions Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition lavc: translate non-flag-based er options into flag-based ef options at codec open add -err_filter AVOptions to access flag-based error recognition h264_weight: initialize "height" function argument properly. presets: spelling error in libvpx 1080p50_60 avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X Conflicts: ffplay.c libavformat/libavformat.v libswscale/swscale.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: replace references to deprecated AVCodecContext.error_recognition to ↵Dustin Brody2011-10-221-1/+1
| | | | | | | | | | | | use AVCodecContext.err_recognition Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov2011-10-121-1/+1
| |
* | mjpegdec: print nb_components too in pict debug infoMichael Niedermayer2011-09-171-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: make sure we dont interpret things after the bitstream buffer as ↵Michael Niedermayer2011-09-171-2/+2
| | | | | | | | | | | | resync marker Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Remove buggy avid hacks, they dont do anything good with any file ↵Michael Niedermayer2011-09-161-6/+0
| | | | | | | | | | | | | | | | | | i found Fix multi plane jpeg Fixes ticket471 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg: interlaced buggy avid fixMichael Niedermayer2011-09-151-2/+1
| | | | | | | | | | | | Fix Ticket362 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: fix len for AVI1 readerMichael Niedermayer2011-09-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "MJPEG: emulate EOI also on two consecutive SOI."Michael Niedermayer2011-09-151-4/+0
| | | | | | | | | | | | This causes Ticket463, fix will be in the next commits This reverts commit 5e2ea138b7c4c7f3910837611338bb3b8b761045.
* | mjpegdec; even better RSTn skipingMichael Niedermayer2011-09-061-1/+2
| | | | | | | | | | | | Fixes Ticket426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "mjpeg: treat external huffman table setup failure as codec init ↵Michael Niedermayer2011-09-021-2/+2
| | | | | | | | | | | | | | | | failure if external huffman table use requested" This broke mplayer This reverts commit a18e04bcf989a9d7f5629c573f9d70f8a020c7a7.
* | jpegdec: better rst skipingMichael Niedermayer2011-09-021-4/+8
| | | | | | | | | | | | Fixes Ticket426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MJPEG: emulate EOI also on two consecutive SOI.Reimar Döffinger2011-09-011-0/+4
| | | | | | | | | | | | Fixes issue #362. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Reset cur_scan at more appropriate places.Reimar Döffinger2011-09-011-1/+3
| | | | | | | | | | | | | | | | Reset it when we actually process an EOI, not when we actually decide to ignore it for bug-workarounds, and reset it on SOF to make it more reliable in case of missing EOI. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | jpegdec: set color_rangeGavin Kinsey2011-09-011-1/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-2/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: add 'extern_huff' private option.Anton Khirnov2011-08-311-0/+20
| | | | | | | | Deprecate CODEC_FLAG_EXTERN_HUFF
| * mjpeg: treat external huffman table setup failure as codec init failure if ↵Dustin Brody2011-08-311-2/+2
| | | | | | | | | | | | external huffman table use requested Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Replace goto by break, it has the same effect.Reimar Döffinger2011-08-271-2/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-131-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status