summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit '350ed1829268d343b791208c8fd1cddd44d52a8e': rtpdec_hevc: drop unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: drop unnecessary checkVittorio Giovara2014-10-20
| | | | | | | | | | | | len is always >=1 in that case. Bug-Id: CID 1238784
* | Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '322b571d5591978efd6f6fee12181ac8900079fe': rtmpproto: remove dead code See: 3a8b66af6cf6af9da5ff97a5930d10a7a4568558 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: remove dead codeVittorio Giovara2014-10-20
| | | | | | | | | | | | | | Expression already evaluated before, redundant since 053386864219eccbcca1886c55f902f9555428a5. Bug-Id: CID 732199
* | Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04': vf_format: check input validity See: ee16e0cacc16ea60c35a66796410012755263c3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_format: check input validityVittorio Giovara2014-10-20
| | | | | | | | CC: libav-stable@libav.org
* | lavd: export all symbols with av_ prefixLukasz Marek2014-10-20
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2': wtv: clean memory on error See: e47024d72f326f7a76c9df90da861663fc5d5fc2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: clean memory on errorVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718002
* | Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit '9fbc613f0df1628e7e78bca791fa8833846f8210': wtv: check seek_by_sector return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: check seek_by_sector return valueVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1198258
* | Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2': aviobuf: check context before using it See: 7441d1ec330da810a0ffd44a02b2fc60add5b719 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aviobuf: check context before using itVittorio Giovara2014-10-20
| | | | | | | | | | | | | | Avoid a possible null pointer dereference. CC: libav-stable@libav.org Bug-Id: CID 1135769
* | Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '02484d1a9316a9309fc1830825345ab79f6a8d60': avio: fix sizeof argument See: a96577df38469e5075caa416d3374576d9ab64ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: fix sizeof argumentMichael Niedermayer2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732284
* | Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '8ab3b71e4b343cec3fa369a880ab4496d7345154': idcin: fix return check See: ee884c30233856b69fb87345944b4cdfe666fc0f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * idcin: fix return checkVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732198
* | configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC ↵Rong Yan2014-10-20
| | | | | | | | | | | | is enabled and in LE environment Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov.c: Allocate buffer in case of long metadata entries.Thilo Borgmann2014-10-20
| | | | | | | | | | | | Fixes ticket #4018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSDBrad Smith2014-10-20
| | | | | | | | | | | | Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_idet: add both multiple and single frame detection metadataKevin Mitchell2014-10-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cast5: Fix off by one errorMichael Niedermayer2014-10-20
| | | | | | | | | | | | Fixes fate-cast5 on alpha Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Use ff_http_averror()Andrey Utkin2014-10-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Introduce ff_http_averror()Andrey Utkin2014-10-20
| | | | | | | | | | | | | | | | | | | | | | | | | | int ff_http_averror(int status_code, int default_averror) This helper function returns AVERROR_ value from 3-digit HTTP status code. Second argument, default_averror, is used if no specific AVERROR_ is available. It is introduced because in different places of code different return codes are used - -1, AVERROR(EIO), AVERROR_INVALIDDATA. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snowenc: remove redundant FF_MPV_OFFSET()Michael Niedermayer2014-10-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ass: add ASS trailing \r\n in one single placeClément Bœsch2014-10-19
| |
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 09:58:12 +0000