summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* dnxhddata: deduplicate tableChristophe Gisquet2015-09-30
| | | | | | | | | CID 1256 is specified as using the same table for luma and chroma, which is the same as CID 1235 luma table. This is consistent with the format supposedly being RGB, although most sequences seem to actually be YCbCr-encoded. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* videotoolbox: require hardware accelerationStefano Pigozzi2015-09-29
| | | | | | | | | VideoToolbox also implements a software decoder for h264, and will fallback to using it if the file cannot be decoded on the GPU. In these cases though, we want the hwaccel to fail so that we can use the libavcodec software decoder instead of the Apple one. Signed-off-by: wm4 <nfxjfg@googlemail.com>
* lavf/rawenc: Force one stream for hevc and m4v.Carl Eugen Hoyos2015-09-29
|
* avfilter/vf_atadenoise: do not use uninitialized dataPaul B Mahol2015-09-29
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/x86/rnd_template: silence -Wunused-function on --disable-mmxGanesh Ajjanagadde2015-09-29
| | | | | | | | | This silences some of the -Wunused-function warnings when compiled with --disable-mmx, e.g http://fate.ffmpeg.org/log.cgi?time=20150919094617&log=compile&slot=x86_64-archlinux-gcc-disable-mmx. Header guards are too brittle and ugly for this case. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/img2dec: Fix memory leakPrzemysław Sobala2015-09-29
| | | | | | Fixes #4886 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* fate: Add basic license header checkMichael Niedermayer2015-09-29
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba'Hendrik Leppkes2015-09-29
|\ | | | | | | | | | | | | * commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba': tiny_psnr: Use the correct abs() version Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * tiny_psnr: Use the correct abs() versionVittorio Giovara2015-09-29
| |
* | Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e': vf_framepack: Use av_image_copy() where appropriate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * vf_framepack: Use av_image_copy() where appropriateVittorio Giovara2015-09-29
| | | | | | | | | | | | | | This correctly adjust chroma subsampling for column interleaved mode, and allows future high bitdepth support. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | | | | | * commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c': dnxhddec: Enable frame threading FFmpeg has much more threading modes for DNxHD Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddec: Enable frame threadingVittorio Giovara2015-09-29
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e': dnxhddec: Decode and use interlace mb flag Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddec: Decode and use interlace mb flagChristophe Gisquet2015-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bit is 1 in some samples, and seems to coincide with interlaced mbs and CID1260. 2008 specs do not know about it, and maintain qscale is 11 bits. This looks oversized, but may help larger bitdepths. Currently, it leads to an obviously incorrect qscale value, meaning its syntax is shifted by 1. However, reading 11 bits also leads to obviously incorrect decoding: qscale seems to be 10 bits. However, as most profiles still have 11bits qscale, the feature is restricted to the CID1260 profile (this flag is dependent on a higher-level flag located in the header). The encoder writes 12 bits of syntax, last and first bits always 0, which is now somewhat inconsistent with the decoder, but ends up with the same effect (progressive + reserved bit). Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit 'c5e5e6306223623de8352a3ecd224956aa5beb37': riff: Add support for RV40 codec in AVI Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * riff: Add support for RV40 codec in AVIThierry Foucu2015-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60': avconv: Make the private options discovery more manifest Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: Make the private options discovery more manifestVittorio Giovara2015-09-29
| |
* | Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '3973f0f773e0bd212734eccda78aa798f8b20692': Revert "avconv_opt: Allow printing private options" Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * Revert "avconv_opt: Allow printing private options"Vittorio Giovara2015-09-29
| | | | | | | | | | | | This reverts commit 7bb1c1bfd22de2200743af04ebd0c7c775f56f7e. A long existing version in the form of avconv -h decoder=h264 already existed, and this just duplicates it.
* | Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f': lavc: Simplify checking quant bias option Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Simplify checking quant bias optionVittorio Giovara2015-09-29
| |
* | Merge commit '84dfc426cea7242099aea9d47121cea65dffd936'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '84dfc426cea7242099aea9d47121cea65dffd936': avresample: Remove an unused variable Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avresample: Remove an unused variableGanesh Ajjanagadde2015-09-29
| | | | | | | | | | | | This fixes a -Wunused-variable warning. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '4885bde3187a2bb0cae85b67796e07db233bf77f': motion_est_template: Fix undefined left shift of negative number Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * motion_est_template: Fix undefined left shift of negative numberGanesh Ajjanagadde2015-09-29
| | | | | | | | | | | | This fixes a -Wshift-negative-value warning reported with clang 3.7+. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | Merge commit '977f41e274a66c9d257186ca1df8373a09cc4d40'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '977f41e274a66c9d257186ca1df8373a09cc4d40': mlpdec: Fix a undefined left shift of negative number Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mlpdec: Fix a undefined left shift of negative numberGanesh Ajjanagadde2015-09-29
| | | | | | | | | | | | This fixes a -Wshift-negative-value warning reported with clang 3.7+. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d': lavc: Make AVPacket.duration int64, and deprecate convergence_duration Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Make AVPacket.duration int64, and deprecate convergence_durationwm42015-09-29
| | | | | | | | | | | | | | | | | | Note that convergence_duration had another meaning, one which was in practice never used. The only real use for it was a 64 bit replacement for the duration field. It's better just to make duration 64 bits, and to get rid of it. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/apedec: fix undefined left shifts of negative numbersGanesh Ajjanagadde2015-09-29
| | | | | | | | | | | | | | | | | | | | This fixes -Wshift-negative-value reported with clang 3.7+, e.g http://fate.ffmpeg.org/log.cgi?time=20150919172459&log=compile&slot=x86_64-darwin-clang-polly-notiling-3.7. Note that the patch crucially depends on int >= 32 bits, an assumption made in many places in the codebase. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | | | | | * commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b': mips: intreadwrite: Only execute that code for mips r1 or r2 Not merged, as FFmpeg has a separate condition to protect this code. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mips: intreadwrite: Only execute that code for mips r1 or r2Vicente Olivert Riera2015-09-29
| | | | | | | | | | | | | | | | | | MIPS R6 supports unaligned memory access and does not have the load/store-left/right family of instructions. Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com> Signed-off-by: Luca Barbato <lu_zero at gentoo.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | | | | | | | * commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad': configure: mips: Support mips r6, r2 and r1 Not merge, as MIPS support in ffmpeg is handled quite differently and I do not have an env to test. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * configure: mips: Support mips r6, r2 and r1Luca Barbato2015-09-29
| | | | | | | | | | | | Detect the different MIPS architecture variants. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42': configure: Set the initial ldflags to match the cflags Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * configure: Set the initial ldflags to match the cflagsLuca Barbato2015-09-29
| | | | | | | | | | | | | | Some gcc-based toolchain would fail to link if the abi set by the cpuflags does not match the default. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc': libopenh264enc: Use av_log() to log messages Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264enc: Use av_log() to log messagesGregory J. Wolfe2015-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | File libopenh264enc.c has been modified so that the encoder uses av_log() to log messages (error, warning, info, etc.) instead of logging them directly to stderr. At the time the encoder is created, the current libav log level is mapped to an equivalent libopenh264 log level. This log level, and a message logging function that invokes av_log() to actually log messages, are then set on the encoder. This contains further changes and simplifications by Michael Niedermayer and Martin Storsjö. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '8aecec84021a61b943718ff3d7c2c57fcd4af199': qsvdec: make ff_qsv_decode_init() static Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: make ff_qsv_decode_init() staticAnton Khirnov2015-09-28
| | | | | | | | It is not used outside of qsvdec.c anymore.
* | Merge commit '539e5ac2ecfec2e2f441222a43fb0583643ea607'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '539e5ac2ecfec2e2f441222a43fb0583643ea607': examples/qsvdec: free the lavc decoder before closing MFX/VAAPI Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * examples/qsvdec: free the lavc decoder before closing MFX/VAAPIAnton Khirnov2015-09-28
| | | | | | | | lavc expects MFX to still be in a usable state on close.
* | Merge commit '3ee462dca1038e63b8e8d5e751121736d5772a5d'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '3ee462dca1038e63b8e8d5e751121736d5772a5d': examples/qsvdec: do not free the surfaces in the frame_free() callback Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * examples/qsvdec: do not free the surfaces in the frame_free() callbackAnton Khirnov2015-09-28
| | | | | | | | | | Even though libmfx might not need them anymore, avcodec might still access the surfaces. So free them separately at the end.
* | Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2': qsvdec: close the MFX decoder on uninit Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: close the MFX decoder on uninitAnton Khirnov2015-09-28
| |
* | Merge commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a': qsv: document AVQSVContext members Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsv: document AVQSVContext membersAnton Khirnov2015-09-28
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 11:36:22 +0000