aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-0814-2621/+2813
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-071-25/+25
| | |
| * | h264: mark h264_idct_add8_10 with number of XMM registers.Michael Kostylev2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | 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-071-12/+12
| | | | | | | | | | | | | | | | | | Fixes bug 221. CC: libav-stable@libav.org
| * | vp8: always update next_framep[] before returning from decode_frame().Ronald S. Bultje2012-02-071-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+4
| | |
| * | avconv: better next_dts usage.Anton Khirnov2012-02-071-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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-071-15/+16
| | | | | | | | | | | | It more accurately describes what does this variable store.
| * | avconv: reduce overloading for InputStream.pts.Anton Khirnov2012-02-071-11/+9
| | | | | | | | | | | | | | | | | | 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-071-19/+20
| | | | | | | | | | | | It's used to predict dts, not pts.
| * | avconv: rework -t handling for encoding.Anton Khirnov2012-02-0716-50/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+1
| | | | | | | | | | | | | | | | | | 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-072-28/+27
| | | | | | | | | | | | | | | | | | 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-071-126/+125
| | |
| * | apedec: allow the user to set the maximum number of output samples per callJustin Ruggles2012-02-071-2/+20
| | | | | | | | | | | | | | | | | | | | | It makes sense in some cases to split up the output packet to save on memory usage (ape frames can be very large), but the current/default size is arbitrary. Allowing the user to configure this gives more flexibility and requires minimal additional code.
| * | apedec: do not unnecessarily zero output samples for mono framesJustin Ruggles2012-02-071-11/+4
| | |
| * | apedec: allocate a single flat buffer for decoded samplesJustin Ruggles2012-02-071-24/+29
| | | | | | | | | | | | | | | This will allow the decoder to return samples for the full packet, and it also makes the decoded buffer pointers aligned.
| * | apedec: use sizeof(field) instead of sizeof(type)Justin Ruggles2012-02-071-8/+10
| | |
| * | swscale: split C output functions into separate file.Ronald S. Bultje2012-02-074-1508/+1538
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | swscale: Split C input functions into separate file.Ronald S. Bultje2012-02-074-723/+765
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | bytestream: Add bytestream2 writing API.Aneesh Dogra2012-02-061-0/+112
| | | | | | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | | Set default qmax for VC-3/DNxHD to 1024 (maximum allowed by VC-3 spec).Joseph Artsimovich2012-02-072-1/+8
| | | | | | | | | | | | | | | | | | Also increase the global limit on qmax. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix libutvideo compilation.Carl Eugen Hoyos2012-02-071-8/+18
| | | | | | | | | | | | Fixes ticket #985.
* | | lavfi/aspect: rename field aspect->aspect to aspect->ratioStefano Sabatini2012-02-071-12/+12
| | | | | | | | | | | | The new name is more sensible.
* | | lavc: provide aliases to the PCM A-law/mu-law codecsStefano Sabatini2012-02-071-2/+2
| | | | | | | | | | | | They are also known as G.711 codecs.
* | | ffserver: use avcodec_get_context_defaults3()Paul B Mahol2012-02-071-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-0721-29/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "v210enc: use FFALIGN()" doxygen: Do not include license boilerplates in Doxygen comment blocks. avplay: reset decoder flush state when seeking ape: skip packets with invalid size ape: calculate final packet size instead of guessing ape: stop reading after the last frame has been read ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished ape: return error if seeking to the current packet fails in ape_read_packet() avcodec: Clarify AVFrame member documentation. v210dec: check for coded_frame allocation failure v210enc: use stride as it is already calculated v210enc: use FFALIGN() v210enc: return proper AVERROR codes instead of -1 v210enc: do not set coded_frame->key_frame v210enc: check for coded_frame allocation failure drawtext: add 'fix_bounds' option on coords fixing drawtext: fix text_{w, h} expression vars drawtext: add missing braces around an if() block. Conflicts: libavcodec/arm/vp8.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/v210dec.c libavfilter/vf_drawtext.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Revert "v210enc: use FFALIGN()"Paul B Mahol2012-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | FFALIGN doesn't work with non-powers-of-2. This reverts commit 7ad1b612c8a2a1b1b47f6c3c580ced4bca17e1c7. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | doxygen: Do not include license boilerplates in Doxygen comment blocks.Diego Biurrun2012-02-0615-15/+15
| | |
| * | avplay: reset decoder flush state when seekingJustin Ruggles2012-02-061-1/+3
| | | | | | | | | | | | | | | Fixes seeking after decoder has already been flushed for codecs using CODEC_CAP_DELAY.
| * | ape: skip packets with invalid sizeJustin Ruggles2012-02-061-0/+8
| | |
| * | ape: calculate final packet size instead of guessingJustin Ruggles2012-02-061-3/+12
| | | | | | | | | | | | | | | | | | | | | Calculates based on total file size and wavetaillength from the header. Falls back to multiplying finalframeblocks by 8 instead of 4 so that it will at least be overestimating for 24-bit. Currently it can underestimate the final packet size, leading to decoding errors.
| * | ape: stop reading after the last frame has been readJustin Ruggles2012-02-061-1/+1
| | | | | | | | | | | | This avoids buffer overread when the last packet size estimate is too small.
| * | ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finishedJustin Ruggles2012-02-061-2/+2
| | |
| * | ape: return error if seeking to the current packet fails in ape_read_packet()Justin Ruggles2012-02-061-1/+2
| | |
| * | avcodec: Clarify AVFrame member documentation.Kieran Kunhya2012-02-061-2/+2
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | v210dec: check for coded_frame allocation failurePaul B Mahol2012-02-061-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | v210enc: use stride as it is already calculatedPaul B Mahol2012-02-061-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | v210enc: use FFALIGN()Paul B Mahol2012-02-061-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | v210enc: return proper AVERROR codes instead of -1Paul B Mahol2012-02-061-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | v210enc: do not set coded_frame->key_framePaul B Mahol2012-02-061-1/+0
| | | | | | | | | | | | | | | | | | | | | It is already set in avcodec_alloc_frame(). Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | v210enc: check for coded_frame allocation failurePaul B Mahol2012-02-061-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | drawtext: add 'fix_bounds' option on coords fixingAndrey Utkin2012-02-062-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, drawtext filter deliberately altered given text coordinates if text didn't fully fit on the picture. This breaks the use case of scrolling large text, e.g. movie closing credits. Add 'fix_bounds', to make it usable in such cases (by setting its value to 0). Default behavior is not changed, and non-fitting text coords are fixed. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | drawtext: fix text_{w, h} expression varsAndrey Utkin2012-02-061-0/+2
| | | | | | | | | | | | | | | | | | Before, {text_,}{w,h} vars hadn't got initialized Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | drawtext: add missing braces around an if() block.Andrey Utkin2012-02-051-2/+4
| | | | | | | | | | | | | | | | | | Prevents uninitialized read. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | utvideo: remove ff_thread_finish_setup, it isn't needed at allPaul B Mahol2012-02-071-2/+0
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Detect theora keyframes by content in Ogg demuxer.Reimar Döffinger2012-02-061-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | A lot of files do not mark keyframes correctly via granule, so detect keyframe or not based on data and complain if it mismatches. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | ffv1: PIX_FMT_GRAY16 supportPaul B Mahol2012-02-061-9/+19
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | DNxHD: remove ff_thread_finish_setup, it isn't needed at all.Javier Cabezas2012-02-061-2/+0
| | | | | | | | | | | | | | | | | | Should fix issue #938 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: document the unit for the -fs option parameterStefano Sabatini2012-02-062-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 18:03:48 +0000