summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/ass: assume raw=0 in ff_ass_add_rect_bprintClément Bœsch2014-10-19
|
* avutil/error: Introduce new error codes for 4XX and 5XX replies from remote ↵Andrey Utkin2014-10-19
| | | | | | servers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffprobe: Add support for color_trc/color_pri/chroma_locMichael Niedermayer2014-10-19
| | | | | | Idea from: a2c00d22e71d13b72828147be86aa9e961c6cae6 Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtmpproto: Don't mistake app for playpath.Kacper Michajłow2014-10-19
| | | | | | | | | For URLs "rtmp://server[:port]/foo" determine what `foo` refers to. If application name has been defined by the user assume that `foo` is a playpath, otherwise assume application name. Signed-off-by: Kacper Michajłow <kasper93@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavfi: added option to vf_perspective to specify transformation by giving ↵Nicholas Robbins2014-10-19
| | | | | | | destinations of corners of source. Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_idet: add counts to frame metadataKevin Mitchell2014-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/riff: Add UGY2Michael Niedermayer2014-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/filters: fix localtime drawtext example.Simon Thelen2014-10-19
| | | | | | | | | The colon after the localtime function call needs an additional layer of escaping or else everything until the next colon is treated as a fontfile. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: Add format_whitelistMichael Niedermayer2014-10-19
| | | | | | | | This allows restricting demuxers to a list of needed ones for improved security Note, some demuxers themselfs open other demuxers, these are only restricted if AVOptions are forwarded to them. Please check that your code does that. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: add codec_whitelistMichael Niedermayer2014-10-19
| | | | | | This allows restricting decoders to a list of needed ones for improved security Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/utils: Display pixel format information as none ... if unknown ↵Michael Niedermayer2014-10-19
| | | | | | | | | | | | | | instead of omitting it This is similar to 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 The difference this change makes affects only rather few files but looks like: Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc vs. Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/libvpxenc: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers ↵Michael Niedermayer2014-10-19
| | | | | | in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'Michael Niedermayer2014-10-18
|\ | | | | | | | | | | | | * commit '0034314a69e76a53534a74cceef865cfcb7b42cc': rtmp: Always call rtmp_close() on rtmp_open() failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Always call rtmp_close() on rtmp_open() failureAlexander Drozdov2014-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | Prevent possible memory leaks. Connect to nginx and request a non-existent resource to trigger the issue. CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Uwe L. Korn <uwelk@xhochy.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fc1eda543c6ef043300612db90da5cfd972af650': swscale: fix sign extensions in yuv planar conversion Conflicts: libswscale/rgb2rgb_template.c See: a07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5 See: a30972609ca39b791ce1e4e5cc6c3dd6cb9c9b12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix sign extensions in yuv planar conversionVittorio Giovara2014-10-18
| | | | | | | | | | | | | | | | | | | | Casting the left-most byte to unsigned avoids an undefined result of the shift by 24 if bit 7 is set. yuvPlanartouyvy_c and yuvPlanartoyuy2_c are affected. CC: libav-stable@libav.org Bug-Id: CID 732281 / CID 732282
* | Merge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82': oss_audio: use a macro to simplify ioctl() error checking Conflicts: libavdevice/oss_audio.c See: 69c7aad494683953e833e8622776e3bbcc7921ed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oss_audio: use a macro to simplify ioctl() error checkingTimothy Gu2014-10-18
| | | | | | | | | | | | | | | | | | Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is available. CC: libav-stable@libav.org Bug-Id: CID 1238992 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '963f76144897d3f7684d82ec21e51dd50ea1106e': avresample: Make sure the even check does not overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Make sure the even check does not overflowLuca Barbato2014-10-18
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732225
* | Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f': avresample: prevent theoretical division by zero Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: prevent theoretical division by zeroVittorio Giovara2014-10-18
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1231986
* | Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '0d989dbfc4bc5bc1d563e967449116a7a9865258': af_resample: check av_opt_set_dict return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_resample: check av_opt_set_dict return valueVittorio Giovara2014-10-18
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1087076
* | Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | | | * commit '6d96c7ea89600655b1f18a3b12f3f041fa714152': vf_showinfo: Forward the av_image_get_linesize error Conflicts: libavfilter/vf_showinfo.c See: 2aecfd4f209688a8365f18b351f0ecf12fe5f873 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_showinfo: Forward the av_image_get_linesize errorVittorio Giovara2014-10-18
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1087086
* | Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f401792595dd7760f531e8a3bd2336e9033bd45a': vf_drawtext: Do not leak the mmapped textfile Conflicts: libavfilter/vf_drawtext.c See: 6956b048d8198dce5126c8942dece21cfb1a7978 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: Do not leak the mmapped textfileLuca Barbato2014-10-18
| | | | | | | | | | | | | | And validate its size while at it. CC: libav-stable@libav.org Bug-Id: CID 1244189
* | avcodec/wmv2enc: add priv_classMichael Niedermayer2014-10-18
| | | | | | | | | | | | Fixes ratecontrol code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snowenc: add FF_MPV_COMMON_OPTSMichael Niedermayer2014-10-18
| | | | | | | | | | | | | | | | This fixes the ratecontrol code with snow adding FF_MPV_COMMON_OPTS is needed as the generic rate control options are currently in the (unrelated) MpegEncContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45': lavc: make lmax/lmin into private options of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make lmax/lmin into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | avcodec/mjpegenc: add priv_class to encodersMichael Niedermayer2014-10-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: Add missing av_free() to cast5 selftestGiorgio Vazzana2014-10-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40': lavc: make border_masking into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make border_masking into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866': lavc: deprecate unused mb_threshold field Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused mb_threshold fieldAnton Khirnov2014-10-18
| |
* | Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '685be3d1aecf965281128f3b631ed965bcfa754d': libvpxenc: add static-thresh private option Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvpxenc: add static-thresh private optionAnton Khirnov2014-10-18
| | | | | | | | | | | | | | | | Currently, this option is accessed through AVCodecContext.mb_threshold, which originally controlled reusing MB data when transcoding mpeg to mpeg. Since the libvpx meaning is completely different from the original mpegvideo meaning, it is better to use a separate private option for this.
* | Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283': lavc: deprecate unused me_threshold field Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused me_threshold fieldAnton Khirnov2014-10-18
| |
* | Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6': lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of ↵Anton Khirnov2014-10-18
| | | | | | | | mpegvideo encoders
* | Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'a75c2eb25a62105c09b48521aef429dc8a231637': lavc: make rc_eq into private options of mpegvideo encoders Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_eq into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '946f95354ba76ef73c9b66889d86ab5fba4fb486': lavc: make rc_qmod_* into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_qmod_* into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 05:28:41 +0000