summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/ituh263enc: Check den==0 in ff_h263_aspect_to_info()Michael Niedermayer2014-12-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/ffwavesynth: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mux: 2 subtitle packets could have the same DTSMichael Niedermayer2014-12-29
| | | | | | | | | | | | Fixes Ticket3514 See: ETSI EN 300 743 V1.3.1 (2006-11) "In summary, all of the segments of a single display set shall be carried in one (or more) PES packets that have the same PTS value." with PTS = DTS and remuxing of such a stream it is to be expected that sometimes multiple packets would have the same DTS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat/segment.c: Add strftime expansion for segment filename templatesPedro E. M. Brito2014-12-28
| | | | | | | | | | | Allows expansion of the filename template with strftime() with the option -strftime 1 (disabled by default). This allows segments to be named by time of creation, adding some flexibility. Fixes Ticket 4104 (add strftime to segment muxer) Signed-off-by: Pedro E. M. Brito <pedroembrito@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix R10k blue channel output.Carl Eugen Hoyos2014-12-28
| | | | Makes R10k -> gbrp10 ffv1 -> R10k roundtrip bit-identical.
* doc/ffmpeg.texi: document the new -sdp_file optionSimon Thelen2014-12-28
| | | | | Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/dshow: Remove unneeded NULL checksMichael Niedermayer2014-12-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/dshow: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/dv1394: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_cropdetect: add max_outliers parameterMichael Niedermayer2014-12-28
| | | | | | Fixes Ticket3030 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer2014-12-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add sdp_file optionSimon Thelen2014-12-28
| | | | | | | | | Allow printing of sdp information to a file specified by -sdp_file This allows users to print sdp information when at least one of the outputs isn't an rtp stream. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vdpau: fix assertion failure and < vs > errorMichael Niedermayer2014-12-28
| | | | | | Fixes Ticket4211 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'rbultje/vp9-32bit-lpf'Michael Niedermayer2014-12-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rbultje/vp9-32bit-lpf: vp9/x86: add myself to copyright holders for loopfilter assembly. vp9/x86: make filter_16_h work on 32-bit. vp9/x86: make filter_48/84/88_h work on 32-bit. vp9/x86: make filter_44_h work on 32-bit. vp9/x86: make filter_16_v work on 32-bit. vp9/x86: make filter_48/84_v work on 32-bit. vp9/x86: make filter_88_v work on 32-bit. vp9/x86: make filter_44_v work on 32-bit. vp8/x86: save one register in SIGN_ADD/SUB. vp9/x86: store unpacked intermediates for filter6/14 on stack. vp8/x86: move variable assigned inside macro branch. vp9/x86: simplify ABSSUM_CMP by inverting the comparison meaning. vp8/x86: remove unused register from ABSSUB_CMP macro. vp9/x86: slightly simplify 44/48/84/88 h stores. vp9/x86: make cglobal statement more conservative in register allocation. vp9/x86: save one register in loopfilter surface coverage. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp9/x86: add myself to copyright holders for loopfilter assembly.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_16_h work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_48/84/88_h work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_44_h work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_16_v work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_48/84_v work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_88_v work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make filter_44_v work on 32-bit.Ronald S. Bultje2014-12-27
| |
| * vp8/x86: save one register in SIGN_ADD/SUB.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: store unpacked intermediates for filter6/14 on stack.Ronald S. Bultje2014-12-27
| | | | | | | | | | filter16 goes from 508 to 482 (h) or 346 to 314 (v) cycles; filter88 goes from 240 to 238 (h) or 174 to 165 (v) cycles, measured on TOS.
| * vp8/x86: move variable assigned inside macro branch.Ronald S. Bultje2014-12-27
| | | | | | | | The value is not used outside the branch.
| * vp9/x86: simplify ABSSUM_CMP by inverting the comparison meaning.Ronald S. Bultje2014-12-27
| |
| * vp8/x86: remove unused register from ABSSUB_CMP macro.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: slightly simplify 44/48/84/88 h stores.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: make cglobal statement more conservative in register allocation.Ronald S. Bultje2014-12-27
| |
| * vp9/x86: save one register in loopfilter surface coverage.Ronald S. Bultje2014-12-27
| |
* | r210enc.c: Simplify and never store more than 10 bits.Reimar Döffinger2014-12-27
|/ | | | | | | | | | | | The r10k and avrp decoders would previously store 12 bit precision for the blue channel, which is inconsistent and probably not a desirable behaviour. Now the 2 unused extra bits are set to 0. This is possibly not ideal either as RGBA1010102 format has the same layout but stores alpha in these bits, thus explicitly setting them to 1 might be preferable. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* avutil/atomic: reuse ret to avoid dereferencing twice the same value.Clément Bœsch2014-12-27
|
* avfilter/vf_cropdetect: Factorize duplicated code using a macroMichael Niedermayer2014-12-27
| | | | | | | This simplifies subsequent changes Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_blend: Fix AVClassMichael Niedermayer2014-12-27
| | | | | | Fixes infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: add tblend filterStefano Sabatini2014-12-27
|
* avutil/hmac: use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/audio_fifo: use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/dict: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3'Michael Niedermayer2014-12-27
|\ | | | | | | | | | | | | | | * commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3': h264: restore a block mistakenly removed in e10fd08a See: 0ecb3075c1c243cfb656d1cbe0b19cdb91bde659 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: restore a block mistakenly removed in e10fd08aAnton Khirnov2014-12-27
| | | | | | | | | | CC: libav-stable@libav.org Bug-ID: 781
* | Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'Michael Niedermayer2014-12-27
|\| | | | | | | | | | | | | | | | | | | * commit '737d35e33408263c04d7730f5487eed0d04938ba': vdpau: add support for the H.264 High 4:4:4 Predictive profile Conflicts: libavcodec/vdpau_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add support for the H.264 High 4:4:4 Predictive profileRémi Denis-Courmont2014-12-25
| | | | | | | | | | Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec'Michael Niedermayer2014-12-27
|\| | | | | | | | | | | | | * commit '1f9237f2ac46dfbed1bfa1f4f0f1314c2a1d62ec': avconv_vdpau: allocate video surface of VDPAU-specified size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv_vdpau: allocate video surface of VDPAU-specified sizeRémi Denis-Courmont2014-12-25
| | | | | | | | | | Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ebd5320afd42d4315851f3e0ca7f5d4a6300eb68'Michael Niedermayer2014-12-27
|\| | | | | | | | | | | | | * commit 'ebd5320afd42d4315851f3e0ca7f5d4a6300eb68': vdpau: add support for 4:2:2 and 4:4:4 chroma sampling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add support for 4:2:2 and 4:4:4 chroma samplingRémi Denis-Courmont2014-12-25
| | | | | | | | | | Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'Michael Niedermayer2014-12-27
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9': vdpau: add helper for surface chroma type and size Conflicts: libavcodec/vdpau.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add helper for surface chroma type and sizeRémi Denis-Courmont2014-12-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the VDPAU pixel format does not distinguish between different VDPAU video surface chroma types, we need another way to pass this data to the application. Originally VDPAU in libavcodec only supported decoding to 8-bits YUV with 4:2:0 chroma sampling. Correspondingly, applications assumed that libavcodec expected VDP_CHROMA_TYPE_420 video surfaces for output. However some of the new HEVC profiles proposed for addition to VDPAU would require different depth and/or sampling: http://lists.freedesktop.org/archives/vdpau/2014-July/000167.html ...as would lossless AVC profiles: http://lists.freedesktop.org/archives/vdpau/2014-November/000241.html To preserve backward binary compatibility with existing applications, a new av_vdpau_bind_context() flag is introduced in a further change. Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'Michael Niedermayer2014-12-27
|\| | | | | | | | | | | | | | | | | | | * commit '6c99c92a42add7f6a462114d5a4a53c93c551058': libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flagRémi Denis-Courmont2014-12-25
| | | | | | | | | | | | | | | | This can be used by the application to signal its ability to cope with video surface of types other than 8-bits YUV 4:2:0. Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>