summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * 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
| |
* | Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf': lavc: make rc_qsquish a private option of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_qsquish a private option of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836': resample: Avoid off-by-1 errors in PTS calcs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: Avoid off-by-1 errors in PTS calcs.Timothy B. Terriberry2014-10-18
| | | | | | | | | | | | | | | | | | | | | | The rounding used in the PTS calculations in filter_frame() does not actually match the number of samples output by the resampler. This leads to off-by-1 errors in the timestamps indicating gaps and underruns, even when the input timestamps are all contiguous. Bug-Id: 753 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | tests/fate/mpeg4: add -sws_flags +bitexactMichael Niedermayer2014-10-18
| | | | | | | | | | | | | | Should fix fate-mpeg4-resolution-change tests Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit 'fb238f8230c1b0314985482207add548c68f83cf': urlprotocol: remove unused url_interrupt_cb declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * urlprotocol: remove unused url_interrupt_cb declarationAnton Khirnov2014-10-18
| | | | | | | | It is a remnant of the old interrupt callback API.
* | Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0': rtmpproto: Add pause support Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add pause supportUwe L. Korn2014-10-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467': rtmpproto: Track last received timestamp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Track last received timestampUwe L. Korn2014-10-17
| | | | | | | | | | | | | | | | Some RTMP commands need the most recent timestamp as their parameter, so keep track of it. This must be the most recent one and not e.g. the max received timestamp as it can decrease again through seeking. Signed-off-by: Martin Storsjö <martin@martin.st>
* | configure: add pkg-config support for libx264Benoit Fouet2014-10-18
| | | | | | | | | | | | Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: Add CAST128 symmetric block cipherSupraja Meedinti2014-10-18
| | | | | | | | | | | | | | Only ECB mode is supported at the moment Signed-off-by: Supraja Meedinti <supraja0493@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: update documentationMarton Balint2014-10-18
| | | | | | | | | | Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove manual bug option handling codeMarton Balint2014-10-17
| | | | | | | | | | | | It is supported as a codec option, and those are already parsed. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove delays when paused from video and subtitle threadMarton Balint2014-10-17
| | | | | | | | | | | | Once the frame queue is full, we will wait anyway. Signed-off-by: Marton Balint <cus@passwd.hu>
* | hlsenc.c, segment.c: propagate defaults to mpegtsMika Raento2014-10-17
| | | | | | | | | | | | | | | | | | This fixes the abnormally high ts overhead in the files produced by the HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For example makes it much more likely that it can produces streams that fit under the 64kb App store limit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 06:34:53 +0000