1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Commit Graph

75642 Commits

Author SHA1 Message Date
Przemysław Sobala 01dd7e025c lavf/img2dec: Fix memory leak
Fixes #4886

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-29 19:21:13 +02:00
Michael Niedermayer ed18c49f5f fate: Add basic license header check
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-29 18:52:35 +02:00
Hendrik Leppkes fc97b1f091 Merge commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba'
* commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba':
  tiny_psnr: Use the correct abs() version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:44:28 +02:00
Hendrik Leppkes f35c4ede9e Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e'
* commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e':
  vf_framepack: Use av_image_copy() where appropriate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:44:14 +02:00
Hendrik Leppkes b03260fde0 Merge commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c'
* commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c':
  dnxhddec: Enable frame threading

FFmpeg has much more threading modes for DNxHD

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:38:05 +02:00
Hendrik Leppkes 1342d7b2f9 Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e'
* commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e':
  dnxhddec: Decode and use interlace mb flag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:36:06 +02:00
Hendrik Leppkes b3bf41cb75 Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37'
* commit 'c5e5e6306223623de8352a3ecd224956aa5beb37':
  riff: Add support for RV40 codec in AVI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:31:29 +02:00
Hendrik Leppkes 7255cf003e Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'
* commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60':
  avconv: Make the private options discovery more manifest

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:30:48 +02:00
Hendrik Leppkes e490fee6b9 Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'
* commit '3973f0f773e0bd212734eccda78aa798f8b20692':
  Revert "avconv_opt: Allow printing private options"

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:29:46 +02:00
Hendrik Leppkes 773570a9dc Merge commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f'
* commit 'cf7d2f2d2134c0854edf2db91e7436ac2bc9874f':
  lavc: Simplify checking quant bias option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:27:59 +02:00
Hendrik Leppkes 24fea89983 Merge commit '84dfc426cea7242099aea9d47121cea65dffd936'
* commit '84dfc426cea7242099aea9d47121cea65dffd936':
  avresample: Remove an unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:27:42 +02:00
Hendrik Leppkes fe294b3403 Merge commit '4885bde3187a2bb0cae85b67796e07db233bf77f'
* commit '4885bde3187a2bb0cae85b67796e07db233bf77f':
  motion_est_template: Fix undefined left shift of negative number

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:26:59 +02:00
Hendrik Leppkes cbed8dbb7e Merge commit '977f41e274a66c9d257186ca1df8373a09cc4d40'
* commit '977f41e274a66c9d257186ca1df8373a09cc4d40':
  mlpdec: Fix a undefined left shift of negative number

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:26:13 +02:00
Hendrik Leppkes b01891a9f0 Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'
* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d':
  lavc: Make AVPacket.duration int64, and deprecate convergence_duration

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:22:52 +02:00
Ganesh Ajjanagadde d3e5fbb140 avcodec/apedec: fix undefined left shifts of negative numbers
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>
2015-09-29 15:05:38 +02:00
Hendrik Leppkes a2426798d6 Merge commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b'
* 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>
2015-09-29 14:35:07 +02:00
Hendrik Leppkes c096226ae6 Merge commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad'
* 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>
2015-09-29 14:33:35 +02:00
Vittorio Giovara 26e8fa3b50 tiny_psnr: Use the correct abs() version 2015-09-29 14:33:01 +02:00
Vittorio Giovara c9943f00cf vf_framepack: Use av_image_copy() where appropriate
This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-29 14:33:01 +02:00
Vittorio Giovara e94e651c76 dnxhddec: Enable frame threading
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-09-29 14:33:01 +02:00
Christophe Gisquet c49cbecbae dnxhddec: Decode and use interlace mb flag
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>
2015-09-29 14:33:01 +02:00
Thierry Foucu c5e5e63062 riff: Add support for RV40 codec in AVI
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-29 14:33:01 +02:00
Vittorio Giovara b5e4f393b6 avconv: Make the private options discovery more manifest 2015-09-29 14:33:01 +02:00
Vittorio Giovara 3973f0f773 Revert "avconv_opt: Allow printing private options"
This reverts commit 7bb1c1bfd2.
A long existing version in the form of avconv -h decoder=h264 already
existed, and this just duplicates it.
2015-09-29 14:33:01 +02:00
Vittorio Giovara cf7d2f2d21 lavc: Simplify checking quant bias option 2015-09-29 14:33:01 +02:00
Ganesh Ajjanagadde 84dfc426ce avresample: Remove an unused variable
This fixes a -Wunused-variable warning.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-29 14:33:01 +02:00
Ganesh Ajjanagadde 4885bde318 motion_est_template: Fix undefined left shift of negative number
This fixes a -Wshift-negative-value warning reported with clang 3.7+.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-29 14:33:00 +02:00
Ganesh Ajjanagadde 977f41e274 mlpdec: Fix a undefined left shift of negative number
This fixes a -Wshift-negative-value warning reported with clang 3.7+.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-29 14:33:00 +02:00
wm4 948f3c19a8 lavc: Make AVPacket.duration int64, and deprecate convergence_duration
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>
2015-09-29 14:33:00 +02:00
Hendrik Leppkes 071f6edb98 Merge commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42'
* commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42':
  configure: Set the initial ldflags to match the cflags

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:24:35 +02:00
Hendrik Leppkes 4d9b78a875 Merge commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc'
* commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc':
  libopenh264enc: Use av_log() to log messages

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:23:45 +02:00
Hendrik Leppkes 27673f1bea Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'
* commit '8aecec84021a61b943718ff3d7c2c57fcd4af199':
  qsvdec: make ff_qsv_decode_init() static

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:20:05 +02:00
Hendrik Leppkes b1284a4b4a Merge commit '539e5ac2ecfec2e2f441222a43fb0583643ea607'
* commit '539e5ac2ecfec2e2f441222a43fb0583643ea607':
  examples/qsvdec: free the lavc decoder before closing MFX/VAAPI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:17:29 +02:00
Hendrik Leppkes d0a1605134 Merge commit '3ee462dca1038e63b8e8d5e751121736d5772a5d'
* commit '3ee462dca1038e63b8e8d5e751121736d5772a5d':
  examples/qsvdec: do not free the surfaces in the frame_free() callback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:17:23 +02:00
Hendrik Leppkes 9457a11a22 Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'
* commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2':
  qsvdec: close the MFX decoder on uninit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:17:09 +02:00
Hendrik Leppkes 029aa8ff14 Merge commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a'
* commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a':
  qsv: document AVQSVContext members

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:14:10 +02:00
Hendrik Leppkes 6668214521 Merge commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd'
* commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd':
  qsvenc: mark the encoders as INIT_CLEANUP

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:12:47 +02:00
Hendrik Leppkes 49a25d02dd Merge commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc'
* commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc':
  qsvenc: do not try to close the encoder if the session is NULL

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:10:25 +02:00
Hendrik Leppkes 4554178f07 Merge commit '741b352b16dad74b87c4a39bade8902633a2b0e6'
* commit '741b352b16dad74b87c4a39bade8902633a2b0e6':
  qsvdec: list supported pixel formats

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:53:42 +02:00
Hendrik Leppkes c36e85b3d9 Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482'
* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
  lavfi: do not exclude hwaccel formats from ff_all_formats()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:48:58 +02:00
Hendrik Leppkes 88dbdf4845 Merge commit 'cc285521000020ab237d183dc3a26f99fce3030f'
* commit 'cc285521000020ab237d183dc3a26f99fce3030f':
  checkasm/x86: Correctly handle variadic functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:48:24 +02:00
Hendrik Leppkes fd0fa9af80 Merge commit '5405584b7b54ca889c341743de1d58792449830d'
* commit '5405584b7b54ca889c341743de1d58792449830d':
  checkasm: Use a self-balancing tree

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:48:05 +02:00
Hendrik Leppkes d0bf83ff1d Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'
* commit 'a41e5e192ed8f79f6607f978dee3205580ba5039':
  vdpau: fix constrained baseline fallback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:45:38 +02:00
Hendrik Leppkes 4b7685b6c6 Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'
* commit 'cc8db760616a7ec3bd39b22ca45888c01326db13':
  mpegts: use avcodec_get_type() to set codec_type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:45:23 +02:00
Hendrik Leppkes 2f63e83c26 Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb'
* commit 'a5d58fea68b9212e0065a71939e921505504a9bb':
  lavc: reimplement avcodec_get_type() using codec descriptors

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:45:19 +02:00
Hendrik Leppkes b123d82c41 Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'
* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
  vdpau: deprecate av_vdpau_get_profile()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 13:44:59 +02:00
Michael Niedermayer 1b82b934a1 avcodec/x86/sbrdsp: Fix using uninitialized upper 32bit of noise
Fixes crash
Fixes: flicker-1.scout3d21443372922.28.m4a

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-29 13:23:25 +02:00
Vicente Olivert Riera d00bb8addc mips: intreadwrite: Only execute that code for mips r1 or r2
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>
2015-09-29 11:10:37 +02:00
Luca Barbato 1016a75cf3 configure: mips: Support mips r6, r2 and r1
Detect the different MIPS architecture variants.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-29 11:10:37 +02:00
Luca Barbato 678f788fea configure: Set the initial ldflags to match the cflags
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>
2015-09-29 11:10:37 +02:00