ffmpeg.git
5 years agodoc/fftools-common-opts: update/extend documentation for -opencl_bench option
Maneesh Gupta [Tue, 27 Jan 2015 14:58:24 +0000 (20:28 +0530)]
doc/fftools-common-opts: update/extend documentation for -opencl_bench option

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoavcodec/nvenc: Handle non-square pixel aspect ratios
Timo Rothenpieler [Mon, 26 Jan 2015 12:28:22 +0000 (13:28 +0100)]
avcodec/nvenc: Handle non-square pixel aspect ratios

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/fate: added mxf tests for essencegroups and missing index
Mark Reid [Mon, 26 Jan 2015 00:38:00 +0000 (16:38 -0800)]
tests/fate: added mxf tests for essencegroups and missing index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: Fix cleanup in mxf_free_metadataset()
Carl Eugen Hoyos [Wed, 28 Jan 2015 01:59:03 +0000 (02:59 +0100)]
avformat/mxfdec: Fix cleanup in mxf_free_metadataset()

Fixes Ticket4256

Found-by: tholin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket
Michael Niedermayer [Tue, 27 Jan 2015 23:58:03 +0000 (00:58 +0100)]
avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket

This is also simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample_internal.h: Move struct declaration before first use.
Reimar Döffinger [Sun, 18 Jan 2015 22:29:13 +0000 (23:29 +0100)]
swresample_internal.h: Move struct declaration before first use.

It seems more logical and works with more restricted C compilers
like tinycc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoSupport BMP files that do not properly align lines.
Reimar Döffinger [Mon, 26 Jan 2015 19:19:17 +0000 (20:19 +0100)]
Support BMP files that do not properly align lines.

Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoMerge commit '8805589b803fab5f362008306319336ac79a3fa7'
Michael Niedermayer [Tue, 27 Jan 2015 19:31:46 +0000 (20:31 +0100)]
Merge commit '8805589b803fab5f362008306319336ac79a3fa7'

* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'
Michael Niedermayer [Tue, 27 Jan 2015 19:25:40 +0000 (20:25 +0100)]
Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'

* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
  dvbsubdec: check memory allocations and propagate errors

Conflicts:
libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'
Michael Niedermayer [Tue, 27 Jan 2015 19:09:49 +0000 (20:09 +0100)]
Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'

* commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52':
  nuv: validate image size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'
Michael Niedermayer [Tue, 27 Jan 2015 18:53:46 +0000 (19:53 +0100)]
Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'

* commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6':
  nsvdec: validate channels and samplerate

See: d633e15d7d939f532326e2bc92097b12eba4d5ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'
Michael Niedermayer [Tue, 27 Jan 2015 17:49:50 +0000 (18:49 +0100)]
Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'

* commit 'a536a4e4bc52d05f59869761337452fb1f1977f6':
  lavc: support extracting audio service type from side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'
Michael Niedermayer [Tue, 27 Jan 2015 17:32:19 +0000 (18:32 +0100)]
Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'

* commit '32125781487411ed3b1b28b32063d6cd4024d4fc':
  mov: export audio service type as side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'
Michael Niedermayer [Tue, 27 Jan 2015 17:16:42 +0000 (18:16 +0100)]
Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'

* commit '4227e4fe7443733fb906f6fb6c265105e8269c74':
  lavf: add a convenience function for adding side data to a stream

Conflicts:
libavformat/internal.h
libavformat/replaygain.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '728685f37ab333ca35980bd01766c78d197f784a'
Michael Niedermayer [Tue, 27 Jan 2015 17:02:42 +0000 (18:02 +0100)]
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'

* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'
Michael Niedermayer [Tue, 27 Jan 2015 16:29:05 +0000 (17:29 +0100)]
Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'

* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
  nutenc: do not use has_b_frames

Conflicts:
libavformat/nutenc.c
tests/ref/lavf/nut
tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
Michael Niedermayer [Tue, 27 Jan 2015 16:05:59 +0000 (17:05 +0100)]
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'

* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag
Michael Niedermayer [Tue, 27 Jan 2015 15:52:22 +0000 (16:52 +0100)]
avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag

If this causes problems then the stream_codec_tag should be enabled again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibopencv: Rework error handling in parse_iplconvkernel()
Vittorio Giovara [Fri, 23 Jan 2015 16:15:37 +0000 (16:15 +0000)]
libopencv: Rework error handling in parse_iplconvkernel()

Fix 'values' memory leak in case of error.

CC: libav-stable@libav.org
Bug-Id: CID 739879

5 years agodvbsubdec: check memory allocations and propagate errors
Vittorio Giovara [Wed, 17 Dec 2014 15:02:09 +0000 (16:02 +0100)]
dvbsubdec: check memory allocations and propagate errors

5 years agonuv: validate image size
Vittorio Giovara [Fri, 23 Jan 2015 15:03:09 +0000 (15:03 +0000)]
nuv: validate image size

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717750

5 years agonsvdec: validate channels and samplerate
Vittorio Giovara [Fri, 23 Jan 2015 15:03:08 +0000 (15:03 +0000)]
nsvdec: validate channels and samplerate

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717749

5 years agoMerge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'
Michael Niedermayer [Tue, 27 Jan 2015 15:17:42 +0000 (16:17 +0100)]
Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'

* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
  avidec: do not export stream_codec_tag

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
Michael Niedermayer [Tue, 27 Jan 2015 15:03:23 +0000 (16:03 +0100)]
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'

* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
  h264: drop any pretense of support for data partitioning

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'
Michael Niedermayer [Tue, 27 Jan 2015 14:24:08 +0000 (15:24 +0100)]
Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'

* commit '58ae8d595724150c407ca2c2df3aa4bd5580397c':
  h264_parser: restore a comment lost in 0268a54

Conflicts:
libavcodec/h264_parser.c

No change, the code that is commented is no longer there in the form to
which the comment applied

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'
Michael Niedermayer [Tue, 27 Jan 2015 14:15:03 +0000 (15:15 +0100)]
Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'

* commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8':
  h264: do not reset the ref lists in flush_change()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9404a47a2d1df418946a338938eb6cdb3afed474'
Michael Niedermayer [Tue, 27 Jan 2015 14:08:17 +0000 (15:08 +0100)]
Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'

* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
  h264: move parser-only variables to their own context

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
Michael Niedermayer [Tue, 27 Jan 2015 13:56:52 +0000 (14:56 +0100)]
Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'

* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
  error_resilience: move the MECmpContext initialization into ER code

Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'
Michael Niedermayer [Tue, 27 Jan 2015 13:45:27 +0000 (14:45 +0100)]
Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'

* commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf':
  avconv_dxva2: add hevc support

See: 5f2cdf9c3cc5e1159428999ec550a3979576c213
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'
Michael Niedermayer [Tue, 27 Jan 2015 13:24:41 +0000 (14:24 +0100)]
Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'

* commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116':
  Add DXVA2 HEVC HWAccel

Conflicts:
configure
libavcodec/allcodecs.c
libavcodec/dxva2_hevc.c

See: 36962ad2339d003f327336afd6d00ad3a5a58816
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b82722df9b2911bd41e0928db4804067b39e6528'
Michael Niedermayer [Tue, 27 Jan 2015 13:21:49 +0000 (14:21 +0100)]
Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'

* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
  hevc: reindent after previous commit

Conflicts:
libavcodec/hevc.c

See: f8ecffa9b7e49860ce030fb3cabb60b3143384db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'
Michael Niedermayer [Tue, 27 Jan 2015 13:12:53 +0000 (14:12 +0100)]
Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'

* commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba':
  hevc: add hwaccel hooks

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c

See: b2e9b0f5d4dca93f54fba85f3345970a636e2b82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'
Michael Niedermayer [Tue, 27 Jan 2015 13:03:00 +0000 (14:03 +0100)]
Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'

* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
  hevc: store the short term rps flag and size in the context

See: 06894f1a04dda384ab3632b2342f0f97ec9ebed9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '36779a84051eae6744cc936d91b1d428143665ba'
Michael Niedermayer [Tue, 27 Jan 2015 12:55:38 +0000 (13:55 +0100)]
Merge commit '36779a84051eae6744cc936d91b1d428143665ba'

* commit '36779a84051eae6744cc936d91b1d428143665ba':
  hevc: store the escaped/raw bitstream in HEVCNAL

See: 2af82a1ad9f788ec3c1d22e15423996a4b161934
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'
Michael Niedermayer [Tue, 27 Jan 2015 12:54:49 +0000 (13:54 +0100)]
Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'

* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
  hevc: pass the full HEVCNAL struct to decode_nal_unit

Conflicts:
libavcodec/hevc.c

See: 77140279d33006f1d949ee3717af67204dc519c6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'
Michael Niedermayer [Tue, 27 Jan 2015 12:35:27 +0000 (13:35 +0100)]
Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'

* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'
Michael Niedermayer [Tue, 27 Jan 2015 12:29:42 +0000 (13:29 +0100)]
Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'

* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'
Michael Niedermayer [Tue, 27 Jan 2015 12:20:54 +0000 (13:20 +0100)]
Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
Michael Niedermayer [Tue, 27 Jan 2015 12:15:06 +0000 (13:15 +0100)]
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'

* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
  hevc: unref the current frame if frame_start() fails

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'
Michael Niedermayer [Tue, 27 Jan 2015 12:02:20 +0000 (13:02 +0100)]
Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'

* commit '1dd021929f8157b88529ce1e6ab6351dd2899e89':
  hevc: clear unused refs on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f9f883af4fe615a832407a657752e248a96c6280'
Michael Niedermayer [Tue, 27 Jan 2015 11:55:21 +0000 (12:55 +0100)]
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'

* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_dxva2: add hevc support
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:12 +0000 (13:01 +0100)]
ffmpeg_dxva2: add hevc support

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd DXVA2 HEVC HWAccel
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:11 +0000 (13:01 +0100)]
Add DXVA2 HEVC HWAccel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: reindent after previous commit
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:10 +0000 (13:01 +0100)]
hevc: reindent after previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: add hwaccel hooks
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:09 +0000 (13:01 +0100)]
hevc: add hwaccel hooks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: store the short term rps flag and size in the context
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:08 +0000 (13:01 +0100)]
hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: store the escaped/raw bitstream in HEVCNAL
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:07 +0000 (13:01 +0100)]
hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/lut: apply minor compute_gammaval709() doxy fix
Stefano Sabatini [Tue, 27 Jan 2015 10:22:45 +0000 (11:22 +0100)]
lavfi/lut: apply minor compute_gammaval709() doxy fix

5 years agolavc: support extracting audio service type from side data
Anton Khirnov [Fri, 14 Nov 2014 12:53:48 +0000 (13:53 +0100)]
lavc: support extracting audio service type from side data

5 years agomov: export audio service type as side data
Anton Khirnov [Fri, 14 Nov 2014 11:54:52 +0000 (12:54 +0100)]
mov: export audio service type as side data

5 years agolavf: add a convenience function for adding side data to a stream
Anton Khirnov [Fri, 14 Nov 2014 11:45:08 +0000 (12:45 +0100)]
lavf: add a convenience function for adding side data to a stream

5 years agoAdd a side data type for audio service type.
Anton Khirnov [Fri, 14 Nov 2014 11:22:06 +0000 (12:22 +0100)]
Add a side data type for audio service type.

Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.

5 years agonutenc: do not use has_b_frames
Anton Khirnov [Sat, 15 Nov 2014 08:46:05 +0000 (09:46 +0100)]
nutenc: do not use has_b_frames

It is unreliable, especially when the stream codec context is not the
encoding context. Use the codec descriptor properties instead.

5 years agolavc: deprecate unused AVCodecContext.stream_codec_tag
Anton Khirnov [Fri, 14 Nov 2014 14:16:01 +0000 (15:16 +0100)]
lavc: deprecate unused AVCodecContext.stream_codec_tag

5 years agoavidec: do not export stream_codec_tag
Anton Khirnov [Fri, 14 Nov 2014 14:11:09 +0000 (15:11 +0100)]
avidec: do not export stream_codec_tag

Handle its only existing use case internally.

5 years agoh264: drop any pretense of support for data partitioning
Anton Khirnov [Mon, 19 Jan 2015 20:58:12 +0000 (21:58 +0100)]
h264: drop any pretense of support for data partitioning

It does not work correctly and apparently never did. There is no
indication that this (mis)feature is ever used in the wild or even that
any software other than the reference supports it.

Since the code that attempts to support it adds some nontrivial
complexity and has resulted in several bugs in the past, it is better to
just drop it.

5 years agoh264_parser: restore a comment lost in 0268a54
Anton Khirnov [Mon, 19 Jan 2015 11:19:47 +0000 (12:19 +0100)]
h264_parser: restore a comment lost in 0268a54

5 years agoh264: do not reset the ref lists in flush_change()
Anton Khirnov [Sun, 18 Jan 2015 11:31:11 +0000 (12:31 +0100)]
h264: do not reset the ref lists in flush_change()

They are always constructed anew when needed, so there is no need to
reset them explicitly.

5 years agoh264: move parser-only variables to their own context
Anton Khirnov [Sat, 17 Jan 2015 16:30:46 +0000 (17:30 +0100)]
h264: move parser-only variables to their own context

5 years agoerror_resilience: move the MECmpContext initialization into ER code
Anton Khirnov [Sat, 17 Jan 2015 16:16:20 +0000 (17:16 +0100)]
error_resilience: move the MECmpContext initialization into ER code

Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.

5 years agoavconv_dxva2: add hevc support
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:51 +0000 (12:58 +0100)]
avconv_dxva2: add hevc support

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoAdd DXVA2 HEVC HWAccel
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:50 +0000 (12:58 +0100)]
Add DXVA2 HEVC HWAccel

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: reindent after previous commit
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:49 +0000 (12:58 +0100)]
hevc: reindent after previous commit

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: add hwaccel hooks
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:48 +0000 (12:58 +0100)]
hevc: add hwaccel hooks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: store the short term rps flag and size in the context
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:47 +0000 (12:58 +0100)]
hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: store the escaped/raw bitstream in HEVCNAL
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:46 +0000 (12:58 +0100)]
hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: pass the full HEVCNAL struct to decode_nal_unit
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:45 +0000 (12:58 +0100)]
hevc: pass the full HEVCNAL struct to decode_nal_unit

This enables decode_nal_unit to access additional fields added in
subsequent commits.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoexamples/transcode_aac: generate proper PTS and set the muxer timebase
Andreas Unterweger [Tue, 27 Jan 2015 08:03:08 +0000 (09:03 +0100)]
examples/transcode_aac: generate proper PTS and set the muxer timebase

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoexamples/transcode_aac: fix a typo
Andreas Unterweger [Tue, 27 Jan 2015 08:00:23 +0000 (09:00 +0100)]
examples/transcode_aac: fix a typo

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoexamples/transcode_aac: properly select the output sample format
Andreas Unterweger [Tue, 27 Jan 2015 07:58:47 +0000 (08:58 +0100)]
examples/transcode_aac: properly select the output sample format

Makes the example work with all the supported AAC encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: unref the current frame if frame_start() fails
Anton Khirnov [Thu, 20 Nov 2014 08:41:56 +0000 (09:41 +0100)]
hevc: unref the current frame if frame_start() fails

Prevents DPB from filling up with damaged input.

5 years agohevc: clear unused refs on failure
Anton Khirnov [Thu, 20 Nov 2014 08:26:35 +0000 (09:26 +0100)]
hevc: clear unused refs on failure

5 years agoh264: simplify code in flush_dpb()
Anton Khirnov [Thu, 20 Nov 2014 06:40:34 +0000 (07:40 +0100)]
h264: simplify code in flush_dpb()

There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.

5 years agofate: Fix bitexactness for vsynth3-dnxhd-1080i-colr
Michael Niedermayer [Tue, 27 Jan 2015 02:41:42 +0000 (03:41 +0100)]
fate: Fix bitexactness for vsynth3-dnxhd-1080i-colr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_eq: mark src as const
Michael Niedermayer [Tue, 27 Jan 2015 00:46:08 +0000 (01:46 +0100)]
avfilter/vf_eq: mark src as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use ar and ranlib in deterministic mode if available
Andreas Cadhalpun [Mon, 26 Jan 2015 22:50:29 +0000 (23:50 +0100)]
configure: use ar and ranlib in deterministic mode if available

this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_eq: Fix clipping code
Michael Niedermayer [Mon, 26 Jan 2015 22:46:44 +0000 (23:46 +0100)]
avfilter/vf_eq: Fix clipping code

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "configure: use ar and ranlib in deterministic mode"
Michael Niedermayer [Mon, 26 Jan 2015 22:02:01 +0000 (23:02 +0100)]
Revert "configure: use ar and ranlib in deterministic mode"

This breaks on BSDs

This reverts commit 7e857cd57108358531b62ba58daa79adf21878e5.

5 years agoconfigure: use ar and ranlib in deterministic mode
Andreas Cadhalpun [Wed, 21 Jan 2015 21:32:58 +0000 (22:32 +0100)]
configure: use ar and ranlib in deterministic mode

this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: Add simplistic 'colr' tag writing support to mov container
Kevin Wheatley [Mon, 26 Jan 2015 15:39:24 +0000 (16:39 +0100)]
avformat/movenc: Add simplistic 'colr' tag writing support to mov container

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/crypto_bench: add Camellia support
James Almer [Mon, 26 Jan 2015 01:56:29 +0000 (22:56 -0300)]
tools/crypto_bench: add Camellia support

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/nvenc: Fix b-frame parameter handling
Timo Rothenpieler [Mon, 26 Jan 2015 12:28:21 +0000 (13:28 +0100)]
avcodec/nvenc: Fix b-frame parameter handling

This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'rdp/dshow_tv_tuner'
Michael Niedermayer [Mon, 26 Jan 2015 13:39:22 +0000 (14:39 +0100)]
Merge remote-tracking branch 'rdp/dshow_tv_tuner'

* rdp/dshow_tv_tuner:
  dshow: tweak logging
  dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
  dshow: alert as to ramifications of switching crossbar routing
  dshow: add properties dialog for tv tuners

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfitler/vf_fieldmatch: fix typo
Paul B Mahol [Mon, 26 Jan 2015 13:04:53 +0000 (13:04 +0000)]
avfitler/vf_fieldmatch: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/libmpcodecs: remove unused headers
Paul B Mahol [Mon, 26 Jan 2015 12:06:24 +0000 (12:06 +0000)]
avfilter/libmpcodecs: remove unused headers

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoDecode Prores 4444 XQ with the existing Prores decoder.
Carl Eugen Hoyos [Mon, 26 Jan 2015 11:05:14 +0000 (12:05 +0100)]
Decode Prores 4444 XQ with the existing Prores decoder.

The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.

5 years agolavfi/mp: drop mp=eq and mp=eq2
Stefano Sabatini [Mon, 26 Jan 2015 09:29:21 +0000 (10:29 +0100)]
lavfi/mp: drop mp=eq and mp=eq2

mp=eq2 was ported to a native libavfilter filter in commit
4c38e960d0ca81b78dec1589275a5274dde21c8e.

5 years agoavfilter/vf_eq: fix leak of input frame
Paul B Mahol [Mon, 26 Jan 2015 09:43:51 +0000 (09:43 +0000)]
avfilter/vf_eq: fix leak of input frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodshow: tweak logging
rogerdpack [Mon, 26 Jan 2015 09:03:48 +0000 (02:03 -0700)]
dshow: tweak logging

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: crossbar dialog was frequently being displayed twice, split up option so it...
rogerdpack [Mon, 26 Jan 2015 08:29:58 +0000 (01:29 -0700)]
dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: alert as to ramifications of switching crossbar routing
rogerdpack [Mon, 26 Jan 2015 08:08:04 +0000 (01:08 -0700)]
dshow: alert as to ramifications of switching crossbar routing

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: add properties dialog for tv tuners
rogerdpack [Sun, 25 Jan 2015 02:56:02 +0000 (19:56 -0700)]
dshow: add properties dialog for tv tuners

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agofate: add Camellia test
James Almer [Mon, 26 Jan 2015 02:00:55 +0000 (23:00 -0300)]
fate: add Camellia test

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoFix creation of ffprobe-test.nut on remote targets.
Carl Eugen Hoyos [Mon, 26 Jan 2015 00:27:38 +0000 (01:27 +0100)]
Fix creation of ffprobe-test.nut on remote targets.

This is not sufficient to run "make fate-ffprobe" on a remote system:
The ffprobe output contains the relative path to the testfile, it is
necessary to run the test from the build directory.
One solution is to use a script like the following as --target-exec:
ssh target "cd /remote/build/directory; $(printf "%q " "$@")"

5 years agoLICENSE.md: add vf_eq
Michael Niedermayer [Sun, 25 Jan 2015 23:36:17 +0000 (00:36 +0100)]
LICENSE.md: add vf_eq

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Port mp=eq/eq2 to lavfi
Arwa Arif [Sun, 18 Jan 2015 22:26:48 +0000 (03:56 +0530)]
avfilter: Port mp=eq/eq2 to lavfi

Code adapted from James Darnley's port
Some fixes from Paul B Mahol <onemda@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/sbrdsp: Use different mem moves
Christophe Gisquet [Sun, 25 Jan 2015 21:13:10 +0000 (18:13 -0300)]
x86/sbrdsp: Use different mem moves

Before
2843 decicycles in ff_sbr_autocorrelate_sse3, 262086 runs, 58 skips

After
2693 decicycles in ff_sbr_autocorrelate_sse3, 262117 runs, 27 skips

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agox86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}
James Almer [Sun, 25 Jan 2015 21:06:28 +0000 (18:06 -0300)]
x86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}

2 to 2.5 times faster.

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavfilter/vf_mcdeint: Set no_bitstream=1
Michael Niedermayer [Sun, 25 Jan 2015 18:00:07 +0000 (19:00 +0100)]
avfilter/vf_mcdeint: Set no_bitstream=1

This avoids unneeded writing of the bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mcdeint: fix gop_size
Michael Niedermayer [Sun, 25 Jan 2015 15:00:46 +0000 (16:00 +0100)]
avfilter/vf_mcdeint: fix gop_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>