summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-3164-257/+301
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpc8: return more meaningful error codes.Anton Khirnov2012-07-311-3/+3
| |
| * mpc: return more meaningful error codes.Anton Khirnov2012-07-311-8/+8
| |
| * wv,mpc8: don't return apetag data in packets.Anton Khirnov2012-07-314-9/+34
| |
| * rtmp: do not warn about receiving metadata packetsSamuel Pitoiset2012-07-311-1/+2
| | | | | | | | | | | | They are managed in get_packet() Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * x86: h264dsp: Adjust YASM #ifdefsDiego Biurrun2012-07-311-3/+1
| | | | | | | | This fixes compilation with YASM disabled.
| * x86: yadif: Mark mmxext optimizations as suchDiego Biurrun2012-07-311-5/+5
| | | | | | | | | | The yadif mmx optimizations contain the pmaxsw and pmaxub mmxext instructions, causing sigills on CPUs that do not support mmxext.
| * h264: convert loop filter strength dsp function to yasm.Ronald S. Bultje2012-07-302-155/+175
| | | | | | | | | | | | | | This completes the conversion of h264dsp to yasm; note that h264 also uses some dsputil functions, most notably qpel. Performance-wise, the yasm-version is ~10 cycles faster (182->172) on x86-64, and ~8 cycles faster (201->193) on x86-32.
| * Improve descriptiveness of a number of codec and container long namesDiego Biurrun2012-07-3056-75/+75
| |
* | loco: fix return value.Nicolas George2012-07-311-1/+1
| | | | | | | | | | The return value was the number of bytes left, it is supposed to be the number of bytes used.
* | loco: take decode overflow into account.Nicolas George2012-07-311-9/+14
| | | | | | | | | | | | Commit 2bf0982 introduced an overflow check in loco_decode_plane, but the error code is never taken into account, leading to completely idiotic return values.
* | sp5xdec: sanitize return value.Nicolas George2012-07-311-1/+1
| | | | | | | | | | | | i is the decoded size of a recoded packet, which is larger than the original packet. Assume that if decoding succeeded, all the packet was used.
* | 8svx: unify mono and stereo code paths.Nicolas George2012-07-311-8/+9
| |
* | 8svx: remove useless rounding code.Nicolas George2012-07-311-1/+3
| | | | | | | | | | | | samples_size and samples_idx are supposed to be multiple of channels at all time. If they are, the division is exact; if they are not, something is very wrong in the code.
* | 8svx: use a more direct condition.Nicolas George2012-07-311-3/+3
| | | | | | | | | | esc->table was inited based on codec->id: re-testing codec->id is code duplication and can lead to inconsistencies.
* | movtextdec: fix return value for too small packets.Nicolas George2012-07-311-1/+1
| |
* | mmvideo: count preamble size in return value.Nicolas George2012-07-311-2/+2
| | | | | | | | | | MM_PREAMBLE_SIZE is subtracted from buf_size almost immediately. The original size is still in avpkt->size.
* | vc1dec: count ENDOFSEQ code in return value.Nicolas George2012-07-311-1/+1
| |
* | ffprobe: fix validity error with tags and data.Nicolas George2012-07-312-1/+7
| | | | | | | | | | | | | | | | Add "data" and "extradata" attributes to the schema. Add "tag" element in "streams". Print extradata before tags to avoid closing the element. Fix trac ticket #1588.
* | lavfi/movie: force channel layout if not set by the decoderStefano Sabatini2012-07-311-2/+30
| | | | | | | | | | | | | | This ensures that the output buffers will have the channel layout set, which is required by filters. Also consistent with ffmpeg.c behavior.
* | ffprobe: show audio frame channels and channel_layoutStefano Sabatini2012-07-312-0/+10
| |
* | lavc: add channels field to AVFrameStefano Sabatini2012-07-314-1/+19
| | | | | | | | | | | | This is required otherwise it is not always possible to guess the number of channels from the layout, for example if the channel layout is unknown.
* | lavfi/asettb: do not create a new reference in filter_samples()Stefano Sabatini2012-07-311-8/+6
| | | | | | | | | | | | | | | | | | There is no need to duplicate the input reference, since a filter should not pass along a reference which is later modified. If this happens the filter passing the reference should be fixed. Also improve consistency with start_frame() of settb, allowing a pending factorization.
* | lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special valuesStefano Sabatini2012-07-311-0/+2
| | | | | | | | The documentation was erroneously removed in 7cf9aadd.
* | mpegdemux: Fix probing of unrecognized_mpeg_video.mpgMichael Niedermayer2012-07-311-1/+1
| | | | | | | | | | | | Fixes Ticket1586 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: fix handling of max_coded dimensionsMichael Niedermayer2012-07-312-7/+10
| | | | | | | | | | | | Fixes Ticket1502 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4videoenc: ensure SAR is within the supported rangeMichael Niedermayer2012-07-311-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30104-324/+400
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Drop pointless "format" from container long namesDiego Biurrun2012-07-3086-135/+135
| |
| * swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.Ronald S. Bultje2012-07-291-1/+1
| |
| * wv: K&R formatting cosmeticsAnton Khirnov2012-07-301-79/+96
| |
| * configure: Add missing descriptions to help outputDiego Biurrun2012-07-301-1/+6
| |
| * h264_ps: declare array of colorspace strings on its own line.Ronald S. Bultje2012-07-291-1/+2
| |
| * fate: amix: specify f32 sample format for comparisonMans Rullgard2012-07-291-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * tiny_psnr: support 32-bit float samplesMans Rullgard2012-07-291-5/+49
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * eamad/eatgq/eatqi: call special EA IDCT directlyMans Rullgard2012-07-297-51/+57
| | | | | | | | | | | | | | | | | | | | | | | | These decoders use a special non-MPEG2 IDCT. Call it directly instead of going through dsputil. There is never any reason to use a regular IDCT with these decoders or to use the EA IDCT with other codecs. This also fixes the bizarre situation of eamad and eatqi decoding incorrectly if eatgq is disabled. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * eamad: remove use of MpegEncContextMans Rullgard2012-07-291-46/+46
| | | | | | | | | | | | | | | | There is no sense in pulling in this monster struct just for a handful of fields. The code does not call any functions expecting an MpegEncContext. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegvideo: remove unnecessary inclusions of faandct.hMans Rullgard2012-07-292-2/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * af_asyncts: avoid overflow in out_size with large delta valuesJustin Ruggles2012-07-291-1/+1
| |
| * af_asyncts: add first_pts optionJustin Ruggles2012-07-292-2/+8
| | | | | | | | | | | | This allows for padding/trimming at the start of stream. By default, no assumption is made about the first frame's expected pts, so no padding or trimming is done.
* | lavfi: use correct PTS for link age.Nicolas George2012-07-301-1/+1
| | | | | | | | | | When start_frame has returned, the buffer reference's PTS may have been modified by another filter.
* | buildsys: fix c++ compilationMichael Niedermayer2012-07-302-2/+4
| | | | | | | | | | Based on code by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: fix forgotten hunk for framerate order change in ffmpeg.cMichael Niedermayer2012-07-301-1/+1
| | | | | | | | | | | | | | broken by: cbb2c95e47cd83cb65b2ce77cbb0296e85fa506b i had fixed that commit but pushed from an old branch Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | yadif: update frame rateMichael Niedermayer2012-07-302-34/+68
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: init simple filter graph before trying to extract framerate from its ↵Michael Niedermayer2012-07-301-11/+11
| | | | | | | | | | | | output. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: fix minor typoMichael Niedermayer2012-07-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audioconvert: add av_get_standard_channel_layout().Nicolas George2012-07-304-1/+27
| | | | | | | | Also bump minor version and add APIchanges entry.
* | audioconvert: add av_get_channel_description().Nicolas George2012-07-302-0/+19
| |
* | audioconvert: include the description of channels in the library.Nicolas George2012-07-301-29/+34
| |
* | flacdec: fix memleaksPaul B Mahol2012-07-301-20/+19
| | | | | | | | | | | | While here refactor code. Signed-off-by: Paul B Mahol <onemda@gmail.com>
OpenPOWER on IntegriCloud