summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avfilter: remove duplicate includesMichael Niedermayer2013-09-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/cpu: remove duplicate includeMichael Niedermayer2013-09-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/fraps: use BT.709 colorspace for YUV Fraps versionsHendrik Leppkes2013-09-21
| | | | | Based both on comparison to the reference decoder, and comments from the fraps developers upon inquiry how to handle the yuv fraps variants.
* lavfi/pad,crop,scale: remove options description from filter descriptionPaul B Mahol2013-09-21
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444pPaul B Mahol2013-09-21
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* tools: Fix apparent merge failureAlex Smith2013-09-21
|
* matroska: Add the CueDuration elementJames Almer2013-09-21
| | | | | | | | | Use it only on subtitle CuePoints. With proper demuxer/splitter support this should improve the display of subtitles right after seeking to a given point in the stream. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-09-21
|\ | | | | | | | | | | | | * cehoyos/master: Allow encoding YUVJ422P and YUVJ444P with libx264. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Allow encoding YUVJ422P and YUVJ444P with libx264.Carl Eugen Hoyos2013-09-21
| | | | | | | | Reviewed-by: Reimar
* | Remove '-vf' from pullup documentation example.Carl Eugen Hoyos2013-09-21
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-21
|\ \ | | | | | | | | | | | | | | | | | | * qatar/master: h264dec: Add .avc file name extension Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | h264dec: Add .avc file name extensionVittorio Giovara2013-09-20
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | | Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'Michael Niedermayer2013-09-21
|\| | | | | | | | | | | | | | | | | | | | * commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9': h264dec: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | h264dec: K&R formatting cosmeticsVittorio Giovara2013-09-20
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | | fate: add adelay testPaul B Mahol2013-09-21
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | dvbsubdec: Check for invalid clut selector.Reimar Döffinger2013-09-21
| | | | | | | | | | | | | | | | | | Fail decoding if strict compliance is requested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Apply clut changes only to one table.JULIAN GARDNER2013-09-21
| |/ |/| | | | | | | | | | | | | The specification does not allow multiple bits to be set, but some encoders do it anyway. Applying it only to the first seems to give better results. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | mpeg4dec: Ensure data is not clobbered too early.Reimar Döffinger2013-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid overwriting the bitstream buffer data before we have ended processing the frame. This is necessary to fix hwaccels which might try to use the buffer during the end_frame call. I am not sure but it is possible this could even trigger a use-after-free if the av_fast_malloc allocated a new buffer. This would require that decode_slice did not wind the bitstream forward all the way to the end, which does not currently happen in normal streams. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '67e285ceca1cb602a5ab87010b30d904527924fe'Michael Niedermayer2013-09-21
|\| | | | | | | | | | | | | * commit '67e285ceca1cb602a5ab87010b30d904527924fe': mem: Handle av_reallocp(..., 0) properly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: Handle av_reallocp(..., 0) properlyMartin Storsjö2013-09-20
| | | | | | | | | | | | | | Previously this did a double free (and returned an error). Reported-by: Justin Ruggles Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: add SFTP protocol via libsshLukasz Marek2013-09-21
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Improve pullup documentation.Carl Eugen Hoyos2013-09-21
| | | | | | | | Mention that the fps filter should be used after pullup.
* | avfilter/vf_psnr: avoid 64bit arithmetic in the inner loopMichael Niedermayer2013-09-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_psnr: Prevent integer overflow.Neil Birkbeck2013-09-21
| | | | | | | | | | | | | | | | The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data. (e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32). Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: remove unused variableMichael Niedermayer2013-09-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: remove unused variableMichael Niedermayer2013-09-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: Add CuePoints for subtitle tracksJames Almer2013-09-20
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | * qatar/master: h264: remove an unused static constant Merge only for metadata as the constant us not unused in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: remove an unused static constantVittorio Giovara2013-09-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | * commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747': msvc/icl: Use __declspec(noinline) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msvc/icl: Use __declspec(noinline)Alex Smith2013-09-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | * commit '09f2581dc5edb3642858d69d9a70b67e249167e9': msvc/icl: Use __declspec(deprecated) Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msvc/icl: Use __declspec(deprecated)Alex Smith2013-09-20
| | | | | | | | | | | | | | | | | | | | | | Prior to this on msvc/icl there was no handling of deprecated functions and the deprecated warning was disabled. After enabling there are a number of warnings relating to the CRT and the use of the non-secure versions of several functions. Defining _CRT_SECURE_NO_WARNINGS silences these warnings. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | * commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91': rtmp: Unbreak get_packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Unbreak get_packetLuca Barbato2013-09-20
| | | | | | | | Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
* | Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e': dcadec: Validate the lfe parameter Conflicts: libavcodec/dcadec.c See: 3b2cd83a829e01a603b52fdc058a054b7899d06e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: Validate the lfe parameterMartin Storsjö2013-09-20
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | * commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4': rtmpproto: Add a comment explaining the logic in handle_notify Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add a comment explaining the logic in handle_notifyMartin Storsjö2013-09-20
| | | | | | | | | | | | | | This explains why the cleanup in 5626f994f was wrong and why ae0f316a was needed. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e5d45e028cf4193b562075897e55091779e49f15'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | * commit 'e5d45e028cf4193b562075897e55091779e49f15': build: Support cparser Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Support cparserLuca Barbato2013-09-19
| |
* | Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd8798276b65543d921adadf63cc7f5ba2d1604af': r3d: Add more input value validation Conflicts: libavformat/r3d.c See: 99b1b2b1c65969ee324d754ea47e04a0a3f685a8 See: df92ac18528bac4566fc4f5ba4d607c1265791ea Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * r3d: Add more input value validationMartin Storsjö2013-09-19
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | * commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44': rl2: Avoid a division by zero See: f371396dfb95c116a05e9b9f690fa916bb2d815e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rl2: Avoid a division by zeroMartin Storsjö2013-09-19
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | | | * commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947': wtv: Add more sanity checks for a length read from the file Conflicts: libavformat/wtv.c See: c42efad3c34cace09555e05fd0cb81cb59cc726f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: Add more sanity checks for a length read from the fileMartin Storsjö2013-09-19
| | | | | | | | | | | | | | | | Also make sure the existing length check can't overflow. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd8b68660145c76a23fc9665f96932449514ecad2': yop: Clear all references to the AVBuffer in the local AVPacket Conflicts: libavformat/yop.c See: 551f683861bbae1002542e70dc196244a1cd24ad Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yop: Clear all references to the AVBuffer in the local AVPacketMartin Storsjö2013-09-19
| | | | | | | | | | | | | | | | | | This makes sure that it doesn't try to free an AVBuffer belonging to an earlier packet when we free the local packet at the end. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3185a80259ce1f8f8111073dbd14a69a396e03a3': fraps: Make the input buffer size checks more strict Conflicts: libavcodec/fraps.c The added checks are mostly to handle duplicate frames, which we discard, thus there are also no P frames for example. Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 15:37:15 +0000