ffmpeg.git
4 years agolavfi: document assumptions about the input and output labels of a filter graph descr...
Stefano Sabatini [Tue, 27 Jan 2015 12:21:56 +0000 (13:21 +0100)]
lavfi: document assumptions about the input and output labels of a filter graph description

4 years agodoc/filters: apply some updates to the Filtergraph syntax section
Stefano Sabatini [Tue, 27 Jan 2015 11:47:29 +0000 (12:47 +0100)]
doc/filters: apply some updates to the Filtergraph syntax section

4 years agoFix frame-alignment in PP7
Arwa Arif [Wed, 28 Jan 2015 14:05:06 +0000 (19:35 +0530)]
Fix frame-alignment in PP7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 29 Jan 2015 02:02:04 +0000 (03:02 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: Added twofish symmetric block cipher
Supraja Meedinti [Sun, 25 Jan 2015 18:39:20 +0000 (00:09 +0530)]
libavutil: Added twofish symmetric block cipher

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd an ARES atom to extradata when encoding avui.
Carl Eugen Hoyos [Thu, 29 Jan 2015 00:07:08 +0000 (01:07 +0100)]
Add an ARES atom to extradata when encoding avui.

Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de

4 years agoMerge commit '61928b68dc28e080b8c8191afe5541123c682bbd'
Michael Niedermayer [Wed, 28 Jan 2015 21:41:39 +0000 (22:41 +0100)]
Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'

* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
libavcodec/h264.c

See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Allow seeking to the end of the buffer for read only buffers
Michael Niedermayer [Wed, 28 Jan 2015 19:55:42 +0000 (20:55 +0100)]
avformat/aviobuf: Allow seeking to the end of the buffer for read only buffers

This undoes the effect of 3c18a7b18807de81566381a1bcbe9f6103c0296b for reading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
Michael Niedermayer [Wed, 28 Jan 2015 19:37:28 +0000 (20:37 +0100)]
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'

* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
  avio: Do not consider the end-of-buffer position valid

Conflicts:
libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'
Michael Niedermayer [Wed, 28 Jan 2015 19:29:12 +0000 (20:29 +0100)]
Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'

* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nsvdec: remove case which is no longer possible
Paul B Mahol [Wed, 28 Jan 2015 09:34:31 +0000 (09:34 +0000)]
avformat/nsvdec: remove case which is no longer possible

Check of channels !=0 is right above.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/x86/vf_fspp: Fix loop condition for column_fidct()
Michael Niedermayer [Wed, 28 Jan 2015 15:30:44 +0000 (16:30 +0100)]
avfilter/x86/vf_fspp: Fix loop condition for column_fidct()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_fspp: check count before calling row_idct()
Michael Niedermayer [Wed, 28 Jan 2015 15:26:00 +0000 (16:26 +0100)]
avfilter/vf_fspp: check count before calling row_idct()

Fixes crash with odd widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_fspp: Fix frame-alignment in FSPP
Arwa Arif [Wed, 28 Jan 2015 14:03:19 +0000 (19:33 +0530)]
avfilter/vf_fspp: Fix frame-alignment in FSPP

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: Do not share rbsp_buffer across threads
Michael Niedermayer [Sun, 25 Aug 2013 01:01:19 +0000 (03:01 +0200)]
h264: Do not share rbsp_buffer across threads

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
4 years agoavio: Do not consider the end-of-buffer position valid
Luca Barbato [Sat, 24 Jan 2015 12:06:19 +0000 (13:06 +0100)]
avio: Do not consider the end-of-buffer position valid

Trigger a refill if the seek action moves the pointer
at the end of the buffer.

Before this patch the read action following the seek would trigger
the refill, while write action would write outside the buffer.

In the Libav codebase few muxers seek forward outside of what
already has been written so it is quite unlikely to experience
the problem with the default buffer size.

CC: libav-stable@libav.org
4 years agolibdc1394: Add support for MONO8 (gray) video mode
Clay McClure [Sun, 4 Jan 2015 07:30:44 +0000 (00:30 -0700)]
libdc1394: Add support for MONO8 (gray) video mode

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:39:15 +0000 (14:39 +0000)]
avfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/avf_avectorscope: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:34:11 +0000 (14:34 +0000)]
avfilter/avf_avectorscope: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/af_biquads: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:30:27 +0000 (14:30 +0000)]
avfilter/af_biquads: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_extractplanes: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:26:13 +0000 (14:26 +0000)]
avfilter/vf_extractplanes: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfitler/vf_il: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:22:26 +0000 (14:22 +0000)]
avfitler/vf_il: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_colorbalance: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:11:30 +0000 (14:11 +0000)]
avfilter/vf_colorbalance: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_telecine: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 13:51:18 +0000 (13:51 +0000)]
avfilter/vf_telecine: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavutil/aes: Rename crypt()
Michael Niedermayer [Wed, 28 Jan 2015 12:12:02 +0000 (13:12 +0100)]
avutil/aes: Rename crypt()

This avoids a potential conflict with the equally named function from XOPEN
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_parser: Rename close()
Michael Niedermayer [Wed, 28 Jan 2015 12:09:30 +0000 (13:09 +0100)]
avcodec/h264_parser: Rename close()

This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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

4 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

4 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

4 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

4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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

4 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

4 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

4 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

4 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.

4 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.

4 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

4 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.

4 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.

4 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

4 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.

4 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

4 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.

4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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.

4 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

4 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.

4 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>