summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-2310-57/+110
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Fix PS in ADTS.Alex Converse2011-11-221-1/+2
| | | | | | | | Fixes File1.aac and Bug 80.
| * dsputil: use cpuflags in x86 emu_edge_coreJustin Ruggles2011-11-221-45/+46
| | | | | | | | avoids passing around the extra argument among all the macros it uses
| * dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()Justin Ruggles2011-11-222-7/+7
| | | | | | | | | | This allows emulated_edge_mc_sse() and gmc_sse() to be used under AV_CPU_FLAG_SSE.
| * wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.Justin Ruggles2011-11-221-0/+3
| | | | | | | | | | | | | | | | The initial values are not checked against the number of block sizes. Initializing them to frame_len_bits will result in a block size index of 0 in these cases instead of something that might be out-of-range. Fixes Bug 81.
| * Add libavutil/mathematics.h #includes for INFINITYMans Rullgard2011-11-222-0/+2
| | | | | | | | | | | | This fixes build errors in some environments. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * doxy: introduce an empty structure in libavcodecLuca Barbato2011-11-221-0/+31
| |
| * ARM: add explicit .arch and .fpu directives to asm.SMans Rullgard2011-11-221-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | This prevents build errors when compiler and assembler default targets differ. Ideally each file would declare the highest level it requires. This is however not easily possible as it complicates assembling pre-armv6t2 code in Thumb-2 mode. HAVE_NEON is used as indicator for ARMv7-A since no other symbol exists for this and NEON is only available in this variant. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * pthread: do not touch has_b_framesJanne Grunau2011-11-222-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the thread count in frame level multithreading to has_b_frames as an additional delay causes more problems than it solves. For example inconsistent behaviour during timestamp calculation in libavformat. Thread count and frame level multithreading are both set by the user. If the additional delay caused by frame level multithreading needs to be considered in the calling code it has all information to take it into account. Should it become necessary to calculate a maximum delay inside libavcodec it should be exported as its own field and not reusing an existing field. Based on a patch by Michael Niedermayer. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-11-221-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * shariman/wmall: call revert_cdlms() Fix some loop conditions to prevent overreads Initialize pred in lms_predict() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | call revert_cdlms()Mashiat Sarker Shakkhar2011-11-221-0/+1
| | |
| * | Fix some loop conditions to prevent overreadsMashiat Sarker Shakkhar2011-11-221-3/+3
| | |
| * | Initialize pred in lms_predict()Mashiat Sarker Shakkhar2011-11-221-1/+1
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-221-0/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pthread: add some malloc failure checks avconv: cosmetics, reformat transcode_init() avconv: rename 'os' variable to 'oc' doc/filters: fix some typos. configure: add libpulse to help output Conflicts: avconv.c configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | pthread: add some malloc failure checksJustin Ruggles2011-11-211-0/+9
| | |
* | | [PATCH] IFF Amiga Continuous Bitmap (ACBM)decoderami_stuff2011-11-211-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some sample IFF ACBM files can be found here: http://aminet.net/package/dev/basic/ABdemos Thanks to Peter Ross for his help with this patch. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'mjbshaw/master'Michael Niedermayer2011-11-211-29/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mjbshaw/master: Applied patches from Michael Niedermayer to clean up the code Added support for J2K encoding with libopenjpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | Applied patches from Michael Niedermayer to clean up the codeMichael Bradshaw2011-11-181-29/+11
| | | |
* | | | Fix various if parenthesis misplacements.Clément Bœsch2011-11-211-1/+1
| | | |
* | | | svq1dec: call avcodec_set_dimensions() after dimensions changed.Michael Niedermayer2011-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes NGS00148 Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | vp3dec: Check coefficient index in vp3_dequant()Michael Niedermayer2011-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes NGS00145 Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | qdm2dec: fix buffer overflow.Michael Niedermayer2011-11-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes NGS00144 Thanks to Phillip for suggestions to improve the patch. Found-by: Phillip Langlois Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | alsdec: update checked AV_EF flags.Michael Niedermayer2011-11-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user who wishes to use default error concealment cannot set the AV_EF_CRCCHECK flag because not every CRC in every format is a reliable indicator of bitstream damage. In some formats crcrs can be nonsensical in absence of any damage. We thus add the AV_EF_CAREFUL flag in addition to the AV_EF_CRCCHECK flag to allow a user to enable this reliable CRC check without having to enable all CRC checks in all formats. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | h264: Fix invalid interlaced progressive MB combinations for direct mode ↵Michael Niedermayer2011-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prediction. Fixes Ticket312 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | h263: make default color black, like flvMichael Niedermayer2011-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes Ticket126 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | mpegvideo: dont use ff_mspel_motion() for vc1Michael Niedermayer2011-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes Ticket655 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-11-201-163/+220
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shariman/wmall: (24 commits) Clean-up dump_int_buffer() to dump samples from a buffer Implement revert_cdlms() Doxy for reset_codec() Store transient state and position of transient area Implement use_high_update_speed() and use_normal_update_speed() Initialize num_logged_tiles and remove unnecessary codes Log index for each line of output Log tile size Output decoded residues Replace placeholders with actual calls to clear_codec_buffers() and reset_codec() Implement lms_update() Implement lms_predict() Implement reset_codec() Add missing syntax elements to WmallDecodeCtx Add .recent syntax element to cdlms struct Implement clear_codec_buffers() Add buffers to context necessary for reverting cdmls and mclms filter Use avpriv_copy_bits() instead of ff_copy_bits() Cosmetics ... Conflicts: libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | Clean-upMashiat Sarker Shakkhar2011-11-201-5/+3
| | | |
| * | | dump_int_buffer() to dump samples from a bufferMashiat Sarker Shakkhar2011-11-201-0/+14
| | | |
| * | | Implement revert_cdlms()Mashiat Sarker Shakkhar2011-11-201-0/+33
| | | |
| * | | Doxy for reset_codec()Mashiat Sarker Shakkhar2011-11-201-0/+3
| | | |
| * | | Store transient state and position of transient areaMashiat Sarker Shakkhar2011-11-201-4/+16
| | | |
| * | | Implement use_high_update_speed() and use_normal_update_speed()Mashiat Sarker Shakkhar2011-11-201-0/+32
| | | |
| * | | Initialize num_logged_tiles and remove unnecessary codesMashiat Sarker Shakkhar2011-11-201-3/+1
| | | |
| * | | Log index for each line of outputMashiat Sarker Shakkhar2011-11-201-0/+1
| | | |
| * | | Log tile sizeMashiat Sarker Shakkhar2011-11-201-1/+1
| | | |
| * | | Output decoded residuesMashiat Sarker Shakkhar2011-11-201-0/+7
| | | |
| * | | Replace placeholders with actual calls to clear_codec_buffers() and ↵Mashiat Sarker Shakkhar2011-11-201-0/+4
| | | | | | | | | | | | | | | | reset_codec()
| * | | Implement lms_update()Mashiat Sarker Shakkhar2011-11-201-0/+49
| | | |
| * | | Implement lms_predict()Mashiat Sarker Shakkhar2011-11-201-0/+17
| | | |
| * | | Implement reset_codec()Mashiat Sarker Shakkhar2011-11-201-0/+11
| | | |
| * | | Add missing syntax elements to WmallDecodeCtxMashiat Sarker Shakkhar2011-11-201-1/+3
| | | |
| * | | Add .recent syntax element to cdlms structMashiat Sarker Shakkhar2011-11-201-1/+4
| | | |
| * | | Implement clear_codec_buffers()Mashiat Sarker Shakkhar2011-11-201-0/+21
| | | |
| * | | Add buffers to context necessary for reverting cdmls and mclms filterMashiat Sarker Shakkhar2011-11-201-0/+4
| | | |
| * | | Use avpriv_copy_bits() instead of ff_copy_bits()Mashiat Sarker Shakkhar2011-11-201-2/+2
| | | |
| * | | CosmeticsMashiat Sarker Shakkhar2011-11-201-5/+5
| | | |
| * | | Add missing ff_ before the AVCodec struct for wmalosslessMashiat Sarker Shakkhar2011-11-201-1/+1
| | | |
| * | | wmall: Working bitstream parserAndreas Öman2011-11-203-0/+1172
| | |/ | |/|
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-2011-63/+130
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Fix stack alignment for SSE avcodec: move some AVCodecContext fields to an internal struct. avcodec: use av_opt_set() instead of deprecated av_set_string3() avcodec: fix some const warnings avcodec: remove pointless AVOption, internal_buffer_count imgutils: Fix illegal read. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud