Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-10Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'Michael Niedermayer
* commit '0307cc2253e76772b1c645ac6117d08da87a147c': rtpdec: pass an AVFormatContext to ff_parse_fmtp() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'Michael Niedermayer
* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb': yuv4mpegenc: do not access AVCodecContext.coded_frame Conflicts: libavformat/yuv4mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'Michael Niedermayer
* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba': nsvdec: remove commented out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'Michael Niedermayer
* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f': mov: free the dv demux context with avformat_free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'Michael Niedermayer
* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb': mtv: do not set sample_rate for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'Michael Niedermayer
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb': oggparsecelt: do not set AVCodecContext.frame_size Conflicts: libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'Michael Niedermayer
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-10Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09ffmpeg: remove common factors from copied timebaseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'Michael Niedermayer
* commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'Michael Niedermayer
* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f': avformat: update muxing doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'Michael Niedermayer
* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9': cdg: set the keyframe flag on the first packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/roqvideoenc: Print the correct max resolutionMichael Niedermayer
Thanks-to: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/roqvideoenc: More verbose warning about no power of 2 dimensionsMichael Niedermayer
Thanks-to: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/dvdsubenc: Add dvdsub workaround for some playersOliver Fromme
The issue affects dvdsub subtitles (a.k.a. VOBSUB). Some players -- in particular hardware players -- cut off the lowest row of pixels if the number of rows in the subtitle is odd. The patch below implements a work-around for that. If the number of rows is odd, it is simply rounded up to an even number, adding an invisible (i.e. fully transparent) row. The work-around can be enabled or disabled with a new option -even_rows_fix. The default is disabled, so there is no change of behaviour for users who don't care about it. The overhead for the fix is low, and in many cases even zero: For subtitles with an odd number of rows (i.e. in 50% of cases on average), the size increases by two bytes because a fully transparent row is encoded as 0x00 0x00. However, in the VOBSUB standard, all data packets are padded to 2KB anyway, so in most cases the additional bytes just use some part of the padding, so there is no overhead. Only in the rare case that the 2KB boundary is hit (0.1% chance), a full 2KB block is added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/pthread_frame: fix setting hwaccel with threads and get_format()Michael Niedermayer
Fixes assertion failure with vdpau and vlc Fixes Ticket3742 Tested-by: oromit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avutil/bprint:ædd io.h, try to fix msvc buildMichael Niedermayer
Suggested-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avformat/m4vdec: raise threshold slightly for detectionMichael Niedermayer
Fixes Ticket3746 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avcodec/mpegvideo: clip mv visualization arrows so that their direction is ↵Michael Niedermayer
maintained Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09rtpdec: pass an AVFormatContext to ff_parse_fmtp()Anton Khirnov
Use it for logging, instead of NULL or the stream codec context.
2014-07-09yuv4mpegenc: do not access AVCodecContext.coded_frameAnton Khirnov
Its contents are meaningful only if the stream codec context is the one actually used for encoding, which is often not the case (and is discouraged). Use AVCodecContext.field_order instead.
2014-07-09nsvdec: remove commented out cruftAnton Khirnov
2014-07-09mov: free the dv demux context with avformat_free_context()Anton Khirnov
2014-07-09mtv: do not set sample_rate for videoAnton Khirnov
2014-07-09oggparsecelt: do not set AVCodecContext.frame_sizeAnton Khirnov
It is supposed to be set by decoders only.
2014-07-09adxdec: get rid of an avpriv functionAnton Khirnov
The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32.
2014-07-09lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov
2014-07-09avconv: set the output stream timebaseAnton Khirnov
This is required by the new API.
2014-07-09avformat: update muxing doxyAnton Khirnov
The callers should now set the stream timebase, not the codec one.
2014-07-09cdg: set the keyframe flag on the first packetAnton Khirnov
Bug-Id: 55
2014-07-09Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.Carl Eugen Hoyos
2014-07-09Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.Carl Eugen Hoyos
2014-07-09avcodec/mpegvideo: flip motion vector visualization for backward motion vectorsMichael Niedermayer
Also support changing arrow head/tail shape Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avdevice/pulse_audio_dec: reimplement using the non simple APIMichael Niedermayer
This fixes timestamps Based-on: code from pulseaudio Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avformat/movenc: respect color_range when encoding dnxhd.Mark Boorer
Set the ACLR atom appropriately for legal / full range. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avformat/segment: remove gettimeofday() use, remove sys/time.hMichael Niedermayer
It causes portability issues, and would need ifdef hell if its kept Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09alpha/idctdsp: move idct init code out of dsputilJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)Alexander V. Lukyanov
AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. This fixes memory corruption from bug #3721 (RTSPState is smaller than MpegTSContext thus innocent memory gets overwritten). Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'Michael Niedermayer
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294': mov: Remove a variable that is set but never used Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'Michael Niedermayer
* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d': avplay: Handle pixel aspect ratio properly See: 32fdfdfbdac64c57b12910521af1379a24d01f73 See: 99b01e458c268cf18ac0981e644e0f835957498a See: 825ec16da955fd9c726d8e6c846cf9257a781a87 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'Michael Niedermayer
* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917': nut: Use nut->version in the version range check Conflicts: libavformat/nutdec.c Note, this bug did not affect ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avdevice/lavfi: add io.h, should fix msvc buildMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/alpha/dsputil_alpha: fix buildMichael Niedermayer
Disable moved functions to prevent build/test failure, patch to update and re-enable them is welcome volunteer to maintain the alpha code is welcome too Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08mov: Remove a variable that is set but never usedMartin Storsjö
This silences a warning with gcc. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-08avplay: Handle pixel aspect ratio properlyMartin Storsjö
This was broken (left half-implemented) in 354468fc12. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-08nut: Use nut->version in the version range checkLuca Barbato
It was wrongly left unchanged when the version field had been introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)
2014-07-08avcodec/proresenc_anatoliy: check against maximum dimensionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/roqvideoenc: check dimensions against maximumMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avcodec/roqvideoenc: fix infinite lambda increasing loopMichael Niedermayer
The threshold was choosen so that no further size decrease happened with larger lambda with the test video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avformat/nutdec: if all else fails try to lookup video tag in isomMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>