summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pixdesc: mark pseudopaletted formats with a special flag. avconv: switch to avcodec_encode_video2(). libx264: implement encode2(). libx264: split extradata writing out of encode_nals(). lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket cmdutils: update copyright year to 2012. swscale: sign-extend integer function argument to qword on x86-64. x86inc: support yasm -f win64 flag also. h264: manually save/restore XMM registers for functions using INIT_MMX. x86inc: allow manual use of WIN64_SPILL_XMM. aacdec: Use correct speaker order for 7.1. aacdec: Remove incorrect comment. aacdec: Simplify output configuration. Remove Sun medialib glue code. dsputil: set STRIDE_ALIGN to 16 for x86 also. pngdsp: swap argument inversion. Conflicts: cmdutils.c configure doc/APIchanges ffmpeg.c libavcodec/aacdec.c libavcodec/dsputil.h libavcodec/libx264.c libavcodec/mlib/dsputil_mlib.c libavcodec/utils.c libavfilter/vf_scale.c libavutil/avutil.h libswscale/mlib/yuv2rgb_mlib.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: mark pseudopaletted formats with a special flag.Anton Khirnov2012-02-08
| | | | | | | | | | | | This makes it possible to dintinguish them from PAL8. Fixes an invalid write in avpicture_layout().
| * avconv: switch to avcodec_encode_video2().Anton Khirnov2012-02-08
| |
| * libx264: implement encode2().Anton Khirnov2012-02-08
| |
| * libx264: split extradata writing out of encode_nals().Anton Khirnov2012-02-08
| | | | | | | | This is done in preparation for the following patch.
| * lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacketAnton Khirnov2012-02-08
| | | | | | | | Deprecate avcodec_encode_video().
| * cmdutils: update copyright year to 2012.Ronald S. Bultje2012-02-08
| |
| * swscale: sign-extend integer function argument to qword on x86-64.Ronald S. Bultje2012-02-08
| |
| * x86inc: support yasm -f win64 flag also.Haruhiko Yamagata2012-02-08
| | | | | | | | | | | | | | This sets __OUTPUT_FORMAT__ to win64 instead of win32, even though both (through -m amd64) produce 64-bit binary code. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * h264: manually save/restore XMM registers for functions using INIT_MMX.Ronald S. Bultje2012-02-08
| | | | | | | | | | On Win64, these registers are callee-save, so not saving/restoring them correctly is a violation of ABI and can lead to crashes or corrupt data.
| * x86inc: allow manual use of WIN64_SPILL_XMM.Henrik Gramner2012-02-08
| | | | | | | | | | | | | | | | Functions using INIT_MMX may still access XMM registers through direct means (xmm0-15). Therefore, they still need to be marked for clobber so they can be properly saved/restored. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * aacdec: Use correct speaker order for 7.1.Alex Converse2012-02-08
| | | | | | | | | | | | | | | | | | The spec says the following speaker mapping is default: center front speaker left, right center front speakers, left, right outside front speakers, left surround, right surround rear speakers, front low frequency effects speaker
| * aacdec: Remove incorrect comment.Alex Converse2012-02-08
| | | | | | | | It was only correct when element ids met very specific criteria.
| * aacdec: Simplify output configuration.Alex Converse2012-02-08
| |
| * Remove Sun medialib glue code.Diego Biurrun2012-02-08
| | | | | | | | | | It is obscure, most likely unused and not bit-exact compared to libavcodec due to a different IDCT transform algorithm.
| * dsputil: set STRIDE_ALIGN to 16 for x86 also.Ronald S. Bultje2012-02-07
| | | | | | | | | | | | This fixes crashes in e.g. PNG decoding with SSE2 enabled. In fact, many x86 optimizations for codecs assume that our buffer strides are 16-byte aligned.
| * pngdsp: swap argument inversion.Ronald S. Bultje2012-02-07
| |
* | ffmpeg: change sync_opts code to be more similar to qatar.Michael Niedermayer2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "vf_fspp: use LOCAL_MANGLE instead of MANGLE."Clément Bœsch2012-02-08
| | | | | | | | | | This reverts commit 1aa8f5fcfba6701eb0181ea07c070d09ab0f4efd. It broke the other x86_32 fate instances.
* | lagarith: refactor codePaul B Mahol2012-02-08
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_fspp: use LOCAL_MANGLE instead of MANGLE.Clément Bœsch2012-02-08
| | | | | | | | | | The symbols are locals, thus the EXTERN_PREFIX should be omitted. This might fix the llvm-gcc fate instance.
* | ffmpeg: update (next_)pts in the stream copy caseMichael Niedermayer2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use ist->dts in rate_emu_sleep()Michael Niedermayer2012-02-08
| | | | | | | | | | Based on change by Anton Khirnov. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use ist->dts in do_streamcopy()Michael Niedermayer2012-02-08
| | | | | | | | | | Based on change by Anton Khirnov. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove setting fb->pts.Anton Khirnov2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: reduce overloading for InputStream.pts.Anton Khirnov2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | It currently has different meanings at different times (dts of the last read packet/pts of the last decoded frame). Reduce obfuscation by storing pts of the decoded frame in the frame itself. Conflicts: ffmpeg.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: update dts variables in transcode_audio()Michael Niedermayer2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move next_dts/pts update out of transcode_video()Michael Niedermayer2012-02-08
| | | | | | | | | | | | this makes it placed similar to qatar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: update ist->pts in transcode_audio with the audio decoders output.Michael Niedermayer2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print more details and rescaled timestamps in debug code.Michael Niedermayer2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use (next_)dts in timestamp discontinuity detection code.Michael Niedermayer2012-02-08
| | | | | | | | | | Strongly based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use the correct (dts) variables for stream copy.Michael Niedermayer2012-02-08
| | | | | | | | | | Strongly based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix (next)_dts/pts init.Michael Niedermayer2012-02-08
| | | | | | | | | | Based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use ist->dts instead of passing an argument into transcode_video().Michael Niedermayer2012-02-08
| | | | | | | | | | | | | | This makes the code more similar to qatar And fixes decoding of the last frame of fate/vc1-ism Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Init dts variables in output_packet()Michael Niedermayer2012-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add (next_dts/dts) variables.Michael Niedermayer2012-02-08
| | | | | | | | | | Strongly based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: make yuv2yuv1 use named registers. h264: mark h264_idct_add8_10 with number of XMM registers. swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case. vp8: always update next_framep[] before returning from decode_frame(). avconv: estimate next_dts from framerate if it is set. avconv: better next_dts usage. avconv: rename InputStream.pts to last_dts. avconv: reduce overloading for InputStream.pts. avconv: rename InputStream.next_pts to next_dts. avconv: rework -t handling for encoding. avconv: set encoder timebase for subtitles. pva-demux test: add -vn swscale: K&R formatting cosmetics for SPARC code apedec: allow the user to set the maximum number of output samples per call apedec: do not unnecessarily zero output samples for mono frames apedec: allocate a single flat buffer for decoded samples apedec: use sizeof(field) instead of sizeof(type) swscale: split C output functions into separate file. swscale: Split C input functions into separate file. bytestream: Add bytestream2 writing API. The avconv changes are due to massive regressions and bugs not merged yet. Conflicts: ffmpeg.c libavcodec/vp8.c libswscale/swscale.c libswscale/x86/swscale_template.c tests/fate/demux.mak tests/ref/lavf/asf tests/ref/lavf/avi tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_avi tests/ref/seek/lavf_mkv tests/ref/seek/lavf_rm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: make yuv2yuv1 use named registers.Ronald S. Bultje2012-02-07
| |
| * h264: mark h264_idct_add8_10 with number of XMM registers.Michael Kostylev2012-02-07
| | | | | | | | | | | | This fixes XMM register clobber problems on Win64. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.Ronald S. Bultje2012-02-07
| | | | | | | | | | | | Fixes bug 221. CC: libav-stable@libav.org
| * vp8: always update next_framep[] before returning from decode_frame().Ronald S. Bultje2012-02-07
| | | | | | | | | | | | | | | | | | | | Also slightly move around code not allocate a new frame if we won't decode it. This prevents us from putting undecoded frames in frame pointers, which (in mt decoding) other threads will use and wait on as references, causing a deadlock (if we skipped decoding) or a crash (if we didn't initialized next_framep[] at all). Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * avconv: estimate next_dts from framerate if it is set.Anton Khirnov2012-02-07
| |
| * avconv: better next_dts usage.Anton Khirnov2012-02-07
| | | | | | | | | | | | | | | | next_dts is used for estimating the dts of the next packet if it's missing. Therefore, it makes no sense to set it from the pts of the last decoded frame. Also it should be estimated from the current packet duration/ticks_per_frame always, not only when a frame was successfully decoded.
| * avconv: rename InputStream.pts to last_dts.Anton Khirnov2012-02-07
| | | | | | | | It more accurately describes what does this variable store.
| * avconv: reduce overloading for InputStream.pts.Anton Khirnov2012-02-07
| | | | | | | | | | | | It currently has different meanings at different times (dts of the last read packet/pts of the last decoded frame). Reduce obfuscation by storing pts of the decoded frame in the frame itself.
| * avconv: rename InputStream.next_pts to next_dts.Anton Khirnov2012-02-07
| | | | | | | | It's used to predict dts, not pts.
| * avconv: rework -t handling for encoding.Anton Khirnov2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | Current code compares the desired recording time with InputStream.pts, which has a very unclear meaning. Change the code to use actual timestamps of the frames passed to the encoder. In several tests, one less frame is encoded, which is more correct. In the idroq test one more frame is encoded, which is again more correct. Behavior with stream copy should be unchanged.
| * avconv: set encoder timebase for subtitles.Anton Khirnov2012-02-07
| | | | | | | | | | | | The actual number (1/1000) will probably require some discussion/tweaking in the future, but should be good enough for now, since the timestamps in AVSubtitle are in this timebase by definition.
| * pva-demux test: add -vnAnton Khirnov2012-02-07
| | | | | | | | | | | | The output is obviously not supposed to contain video (since only -acodec copy is specified), but that only happens because of the way -t handling is implemented currently.
| * swscale: K&R formatting cosmetics for SPARC codeDiego Biurrun2012-02-07
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 10:58:04 +0000