summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-0311-30/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg12: fixed parsing in some mpeg2 streams Add SMPTE240M transfer characteristics flag. mpegts: Some additional HDMV types and reg descriptors for mpegts motionpixels: Clip YUV values after applying a gradient. jpeg: handle progressive in second field of interlaced. ituh263dec: Implement enough of Annex O (scalability) to fix a FPE. h263: more strictly forbid frame size changes with frame-mt. h264: additional protection against unsupported size/bitdepth changes. tta: prevents overflows for 32bit integers in header. configure: remove malloc_aligned. vp8: update frame size changes on thread context switches. snowdsp: explicitily state instruction size. wmall: fix reconstructing audio with uncoded channels WMAL cosmetics: fix indentation gitignore: add Win32 library suffixes Conflicts: configure libavcodec/h263dec.c libavcodec/h264.c libavcodec/ituh263dec.c libavcodec/mjpegdec.c libavcodec/wmalosslessdec.c libavcodec/x86/snowdsp_mmx.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: fixed parsing in some mpeg2 streamsHendrik Leppkes2012-05-031-0/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Add SMPTE240M transfer characteristics flag.Hendrik Leppkes2012-05-031-0/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegts: Some additional HDMV types and reg descriptors for mpegtsJoakim Plate2012-05-031-0/+6
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * motionpixels: Clip YUV values after applying a gradient.Alex Converse2012-05-021-0/+6
| | | | | | | | | | | | Prevents illegal reads on truncated and malformed input. CC: libav-stable@libav.org
| * jpeg: handle progressive in second field of interlaced.Ronald S. Bultje2012-05-021-3/+2
| | | | | | | | | | | | | | | | Progressive data is allocated later in decode_sof(), not allocating that data leads to NULL dereferences. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.Michael Niedermayer2012-05-021-0/+16
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * h263: more strictly forbid frame size changes with frame-mt.Ronald S. Bultje2012-05-021-5/+7
| | | | | | | | | | | | | | Prevents crashes because the old check was incomplete. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * h264: additional protection against unsupported size/bitdepth changes.Ronald S. Bultje2012-05-022-2/+5
| | | | | | | | | | | | | | Fixes crashes in codepaths not covered by original checks. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * tta: prevents overflows for 32bit integers in header.Ronald S. Bultje2012-05-021-3/+5
| | | | | | | | | | | | | | | | This prevents sample_rate/data_length from going negative, which caused various crashes and undefined behaviour further down. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * configure: remove malloc_aligned.Ronald S. Bultje2012-05-021-6/+1
| | | | | | | | | | | | It was to signal that allocations are 16-byte aligned, but AVX requires 32-byte alignment, thus the check is no longer useful (and causes crashes).
| * vp8: update frame size changes on thread context switches.Ronald S. Bultje2012-05-021-0/+2
| | | | | | | | | | | | | | | | | | This properly synchronizes frame size changes between threads if subsequent threads abort decoding before frame size is initialized, i.e. it prevents the thread after that from ping-ponging back to the original value. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * snowdsp: explicitily state instruction size.Ronald S. Bultje2012-05-021-2/+2
| | | | | | | | Fixes a compile error with clang at -O0.
| * wmall: fix reconstructing audio with uncoded channelsKostya Shishkov2012-05-021-3/+3
| |
| * WMAL cosmetics: fix indentationMashiat Sarker Shakkhar2012-05-021-1/+1
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * gitignore: add Win32 library suffixesJoakim Plate2012-05-021-0/+3
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | lavfi/src_buffer: fix indent.Clément Bœsch2012-05-031-5/+4
| |
* | ffmpeg: fix indent.Clément Bœsch2012-05-031-45/+44
| |
* | src_buffer: merge av_asrc_buffer_add_audio_buffer_ref.Nicolas George2012-05-031-21/+1
| | | | | | | | Implement it using av_buffersrc_add_ref.
* | src_buffer: move audio format change check in a separate function.Nicolas George2012-05-031-67/+86
| |
* | src_buffer: move buffer copy in a separate function.Nicolas George2012-05-031-11/+26
| | | | | | | | This will make merging with the audio part easier.
* | src_buffer: move format change check in a separate function.Nicolas George2012-05-031-17/+38
| | | | | | | | This will make merging the check with the audio part easier.
* | src_buffer: introduce av_buffersrc_add_ref().Nicolas George2012-05-032-24/+46
| | | | | | | | | | | | This function merges the features of av_vsrc_buffer_add_video_buffer_ref() and av_buffersrc_buffer().
* | doc: fix API examples references.Clément Bœsch2012-05-031-3/+4
| |
* | JACOsub demuxer, decoder and muxer.Clément Bœsch2012-05-0313-2/+607
| |
* | ffplay: use AVFrame accessor.Nicolas George2012-05-031-1/+1
| |
* | ffmpeg: use AVFrame accessor.Nicolas George2012-05-031-4/+4
| |
* | lavc: implement accessors for some AVFrame fields.Nicolas George2012-05-033-6/+29
| | | | | | | | | | | | | | | | | | Compared to av_opt_ptr, accessors bring: - better performance (negligible); - compile-time type check; - link-time existence check (or at worst, a dynamic linker error instead of a NULL dereference).
* | swr: add ff_int32_to_float_a_avxMichael Niedermayer2012-05-032-3/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: fix rounding error leading to NANMichael Niedermayer2012-05-031-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples/decoding_encoding: fix encoding when all frames got buffered.Michael Niedermayer2012-05-031-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: consistently use '"' for quoting the drawtext arguments in examplesStefano Sabatini2012-05-031-4/+4
| |
* | lavfi/drawtext: give a new alias "timecode_rate" to the the r/rate optionStefano Sabatini2012-05-033-5/+6
| | | | | | | | | | | | The option is related to the timecode, the new name clearly specifies the context. Also it allows to list the option close to the other timecode options.
* | doc/filters: document drawtext draw expressionStefano Sabatini2012-05-031-0/+16
| |
* | lavfi/drawtext: rename and document variables d_expr and d_pexprStefano Sabatini2012-05-031-7/+7
| | | | | | | | | | Use the more expressive names draw_expr and draw_pexpr, also more consistent.
* | doc/filters: document rand() drawtext expression functionStefano Sabatini2012-05-031-2/+5
| |
* | doc/filters: document x and y drawtext expression parametersStefano Sabatini2012-05-031-0/+6
| |
* | doc/filters: fix location of "rate" and "timecode" drawtext optionsStefano Sabatini2012-05-031-7/+8
| | | | | | | | They are options, not expression parameters.
* | lavfi/drawtext: alphabetically sort the expression parametersStefano Sabatini2012-05-032-45/+45
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-029-21/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: arm: intreadwrite: disable inline asm for gcc 4.7 and later arm: intreadwrite: fix inline asm constraints for gcc 4.6 and later indeo3: fix motion vector validation pcm_bluray: set bits_per_raw_sample for > 16-bit twinvq: fix out of bounds array access lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type Conflicts: doc/APIchanges libavcodec/indeo3.c libavcodec/pcm-mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: intreadwrite: disable inline asm for gcc 4.7 and laterMans Rullgard2012-05-021-1/+2
| | | | | | | | | | | | | | | | Starting with version 4.7, gcc properly supports unaligned memory accesses on ARM. Not using the inline asm with these compilers results in better code. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * arm: intreadwrite: fix inline asm constraints for gcc 4.6 and laterMans Rullgard2012-05-021-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a dereferenced type-cast pointer as memory operand, gcc 4.6 and later will sometimes copy the data to a temporary location, the address of which is used as the operand value, if it thinks the target address might be misaligned. Using a pointer to a packed struct type instead does the right thing. The 16-bit case is special since the ldrh instruction addressing modes are limited compared to ldr. The "Uq" constraint produces a memory reference suitable for an ldrsb instruction, which supports the same addressing modes as ldrh. However, the restrictions appear to apply only when the operand addresses a single byte. The memory reference must thus be split into two operands each targeting one byte. Finally, the "Uq" constraint is only available in ARM mode. The Thumb-2 ldrh instruction supports most addressing modes so the normal "m" constraint can be used there. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * indeo3: fix motion vector validationHendrik Leppkes2012-05-011-2/+2
| | | | | | | | | | | | | | | | The index of the motion vector has to be checked before being multiplied by 2 for the array index. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * pcm_bluray: set bits_per_raw_sample for > 16-bitHendrik Leppkes2012-05-011-0/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * twinvq: fix out of bounds array accessMans Rullgard2012-05-011-2/+4
| | | | | | | | | | | | | | | | | | ModeTab.fmode has only 3 elements, so indexing it with ftype in the initialier for 'size' is invalid when ftype == FT_PPC. This fixes crashes with gcc 4.8. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff typeJustin Ruggles2012-05-017-15/+18
| |
* | lavfi: remove screenshot libmpcodecs wrapperPaul B Mahol2012-05-025-327/+1
| | | | | | | | | | | | | | The filter is useless. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: preserve NULL ptrs in get_buffer()Michael Niedermayer2012-05-021-1/+1
| | | | | | | | | | | | Fixes Ticket1260, Ticket1267 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Don't restrict reverse decorrelation to both coded channels. It is also used ↵Jakub Stachowski2012-05-021-1/+1
| | | | | | | | | | | | for mono data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: update mmf seek checksum, change caused by av_get_packet() useageMichael Niedermayer2012-05-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud