aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | swscale: rename "dstw" to "w" to prevent name collisions.Ronald S. Bultje2012-02-121-23/+23
| | | | | | | | | | | | | | | | | | | | "dstw" can collide with the word-version of the "dst" argument, causing all kind of weird stuff down the pipe.
| * | | swscale: use named registers in yuv2yuv1_plane() place.Ronald S. Bultje2012-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | Most of the function had been converted before, but I forgot this particular location.
| * | | lavf: fix aspect ratio mismatch message.Andrey Utkin2012-02-121-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | | avconv: set AVFormatContext.duration from '-t'Andrey Utkin2012-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set output files duration to recording_time option, if given. Rationale: to save duration into metadata for file that is written to non-seekable output, for formats like FLV (with metadata at beginning). Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | | cljr: implement encode2.Anton Khirnov2012-02-121-7/+15
| | | |
| * | | cljr: set the properties of the coded_frame, not input frame.Anton Khirnov2012-02-123-4/+4
| | | |
| * | | dnxhdenc: switch to encode2.Anton Khirnov2012-02-121-7/+12
| | | |
| * | | bmpenc: switch to encode2().Anton Khirnov2012-02-121-11/+16
| | | |
* | | | Fix compilation without HAVE_AVX.Reimar Döffinger2012-02-126-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | %ifdef HAVE_AVX must now be %if HAVE_AVX. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | | threads: Perform the generic progress cleanup more carefully.Michael Niedermayer2012-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup is only done now when a picture is returned (assuming that it has to be done when its returned) a error is returned (assuming that there will be no further progress on the frame) the codec is not h264 (this is still needed due to some deadlocks in realvideo) This fixes a decoding regression with 00017.MTS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | threads: move state update after progress cleanup.Michael Niedermayer2012-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This order is more logic and might prevent a race. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | h264: Mark previous field as done before throwing it away.Michael Niedermayer2012-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes some deadlock without the generic cleanup code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Fix aspect ratio mismatch messageAndrey Utkin2012-02-121-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Simplify: use local variable with same contents directly.Reimar Döffinger2012-02-121-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | | Fix Theora-in-ogg keyframe handling.Reimar Döffinger2012-02-121-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make seeking work correctly, we must write a new granule for each keyframe. Unfortunately we currently have no regression tests due to no included Theora encoder. A test based on -vcodec copy from a Theora FATE sample should probably be added. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | | Detect and check for CMOV.Reimar Döffinger2012-02-124-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some MMX-only CPUs do not have support for CMOV. All SSE/MMX2 CPUs should be fine, thus no check was added to those functions. See also https://sourceforge.net/tracker/?func=detail&aid=3358347&group_id=205275&atid=992986 Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-127-207/+250
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: update reference for seek-alac_mp4 sunrast: Return AVERROR values instead of -1. sunrast: Add support for gray8 decoding. swscale: enforce a minimum filtersize. alacenc: use AVCodec.encode2() alacenc: cosmetics: indentation alacenc: consolidate bitstream writing into a single function. alacenc: only encode frame size in header for a final smaller frame alacenc: store current frame size in AlacEncodeContext. alacenc: return AVERROR codes in alac_encode_frame() alacenc: calculate a new max frame size for the final small frame alacenc: pretty-printing and other cosmetics alacenc: fix error handling and potential memleaks in alac_encode_init() alacenc: do not set coded_frame->key_frame alacenc: do not set bits_per_coded_sample alacenc: remove unneeded frame_size check in alac_encode_frame() tta: error out if samplerate is zero. ttadec: fix invalid free when an error occurs while decoding 24-bit tta wavpack: add needed braces for 2 statements inside an if block Conflicts: tests/ref/acodec/alac Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | FATE: update reference for seek-alac_mp4Justin Ruggles2012-02-111-27/+27
| | | | | | | | | | | | | | | | This should have been updated in b590f3a7bf9103ac7a7a61c48568676201d6824b.
| * | | sunrast: Return AVERROR values instead of -1.Aneesh Dogra2012-02-111-8/+9
| | | | | | | | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | | sunrast: Add support for gray8 decoding.Aneesh Dogra2012-02-111-6/+2
| | | | | | | | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | | swscale: enforce a minimum filtersize.Ronald S. Bultje2012-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At very small dimensions, this calculation could lead to zero-sized filters, which leads to uninitialized output, zero-sized allocations, loop overflows in SIMD that uses do{..}while(i++<filtersize); instead of for(i=0;i<filtersize;i++){..} and several other similar failures. Therefore, require a minimum filtersize of 1. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | | alacenc: use AVCodec.encode2()Justin Ruggles2012-02-111-13/+17
| | | |
| * | | alacenc: cosmetics: indentationJustin Ruggles2012-02-111-27/+27
| | | |
| * | | alacenc: consolidate bitstream writing into a single function.Justin Ruggles2012-02-111-38/+33
| | | | | | | | | | | | | | | | Simplifies use of verbatim mode.
| * | | alacenc: only encode frame size in header for a final smaller frameJustin Ruggles2012-02-112-5/+12
| | | | | | | | | | | | | | | | | | | | Otherwise it is not needed because it matches the frame size as encoded in the extradata.
| * | | alacenc: store current frame size in AlacEncodeContext.Justin Ruggles2012-02-111-13/+16
| | | | | | | | | | | | | | | | This avoids an indirection and will simplify implementation of encode2()
| * | | alacenc: return AVERROR codes in alac_encode_frame()Justin Ruggles2012-02-111-2/+2
| | | |
| * | | alacenc: calculate a new max frame size for the final small frameJustin Ruggles2012-02-111-4/+17
| | | | | | | | | | | | | | | | | | | | Gives a better estimate of buffer requirements and a better decision of whether or not to use verbatim mode.
| * | | alacenc: pretty-printing and other cosmeticsJustin Ruggles2012-02-111-71/+64
| | | |
| * | | alacenc: fix error handling and potential memleaks in alac_encode_init()Justin Ruggles2012-02-111-19/+38
| | | |
| * | | alacenc: do not set coded_frame->key_frameJustin Ruggles2012-02-111-1/+0
| | | | | | | | | | | | | | | | It is already set in avcodec_alloc_frame()
| * | | alacenc: do not set bits_per_coded_sampleJustin Ruggles2012-02-111-5/+4
| | | | | | | | | | | | | | | | encoded ALAC does not have a fixed number of bits per sample
| * | | alacenc: remove unneeded frame_size check in alac_encode_frame()Justin Ruggles2012-02-111-5/+0
| | | |
| * | | tta: error out if samplerate is zero.Ronald S. Bultje2012-02-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents a division by zero later on. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | | ttadec: fix invalid free when an error occurs while decoding 24-bit ttaJustin Ruggles2012-02-101-6/+17
| | | |
| * | | wavpack: add needed braces for 2 statements inside an if blockJustin Ruggles2012-02-101-1/+2
| | | |
* | | | Reduce the verbosity of a mpeg1/2 invalid intra-matrix warning.Carl Eugen Hoyos2012-02-121-1/+1
| | | | | | | | | | | | | | | | Fixes ticket #973.
* | | | ffmpeg: fix passlogfile with multiple libx264 streams.Michael Niedermayer2012-02-121-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | tta: reindentPaul B Mahol2012-02-111-23/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Modified to generate PAT/PMT for video keyframesPavel Koshevoy2012-02-113-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is so that TS fragments produced by http://code.google.com/p/httpsegmenter/ would be compatible with JW Player. A new member variable prev_payload_key was added to MpegTSWriteStream to help detect transition from non-key to key frame, so that PAT/PMT would not be produced for every keyframe in intra-only videos. Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | lagarith: Fix out of array reads.Michael Niedermayer2012-02-111-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | ffv1: Assume encoding all bits is wanted if bits_per_raw_sample == 0.Carl Eugen Hoyos2012-02-111-8/+18
| | | |
* | | | Cosmetics: Move a block in ffv1's encode_init().Carl Eugen Hoyos2012-02-111-38/+38
| | | | | | | | | | | | | | | | Makes the next patch smaller.
* | | | ansi: Fix use of uninitalized width/height warning.Michael Niedermayer2012-02-111-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | tta: Add some safety precautions to avoid freeing things that have not been ↵Michael Niedermayer2012-02-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | allocated. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | tta: do not leak memory if bps == 3Paul B Mahol2012-02-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In bps == 3 case output is decoded directly. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | buildsys: Fix shared lib build of MPlayer.Ingo Brückl2012-02-111-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1130-935/+1187
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (38 commits) v210enc: remove redundant check for pix_fmt wavpack: allow user to disable CRC checking v210enc: Use Bytestream2 functions cafdec: Check return value of avio_seek and avoid modifying state if it fails yop: Check return value of avio_seek and avoid modifying state if it fails tta: Check return value of avio_seek and avoid modifying state if it fails tmv: Check return value of avio_seek and avoid modifying state if it fails r3d: Check return value of avio_seek and avoid modifying state if it fails nsvdec: Check return value of avio_seek and avoid modifying state if it fails mpc8: Check return value of avio_seek and avoid modifying state if it fails jvdec: Check return value of avio_seek and avoid modifying state if it fails filmstripdec: Check return value of avio_seek and avoid modifying state if it fails ffmdec: Check return value of avio_seek and avoid modifying state if it fails dv: Check return value of avio_seek and avoid modifying state if it fails bink: Check return value of avio_seek and avoid modifying state if it fails Check AVCodec.pix_fmts in avcodec_open2() svq3: Prevent illegal reads while parsing extradata. remove ParseContext1 vc1: use ff_parse_close mpegvideo parser: move specific fields into private context ... Conflicts: libavcodec/4xm.c libavcodec/aacdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/mpeg4video_parser.c libavcodec/svq3.c libavcodec/v210enc.c libavformat/cafdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | v210enc: remove redundant check for pix_fmtPaul B Mahol2012-02-101-5/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | | wavpack: allow user to disable CRC checkingPaul B Mahol2012-02-101-16/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>