ffmpeg.git
4 years agoffmpeg_opt: Do not overwrite output if there is no input
Michael Niedermayer [Thu, 26 Mar 2015 23:42:26 +0000 (00:42 +0100)]
ffmpeg_opt: Do not overwrite output if there is no input

Fixes Ticket4254

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/dnxhd: Fix pix_fmt change.
Carl Eugen Hoyos [Sat, 28 Mar 2015 16:36:02 +0000 (17:36 +0100)]
lavc/dnxhd: Fix pix_fmt change.

Fixes ticket #4400.

4 years agopng: Minor whitespace change and added missing comment
Donny Yang [Sat, 28 Mar 2015 15:14:22 +0000 (15:14 +0000)]
png: Minor whitespace change and added missing comment

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopng: Use av_freep() instead of av_free()
Donny Yang [Sat, 28 Mar 2015 15:14:21 +0000 (15:14 +0000)]
png: Use av_freep() instead of av_free()

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate/filter-video: Use qp filter to generate non constant qp array for more throughou...
Michael Niedermayer [Sat, 28 Mar 2015 14:29:56 +0000 (15:29 +0100)]
fate/filter-video: Use qp filter to generate non constant qp array for more throughout testing of the pp filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovfilter/vf_qp: Support evaluating expression per MB
Michael Niedermayer [Sat, 28 Mar 2015 14:18:58 +0000 (15:18 +0100)]
vfilter/vf_qp: Support evaluating expression per MB

also add support for x/y/w/h parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_qp: split expression parsing out of loop
Michael Niedermayer [Sat, 28 Mar 2015 14:17:36 +0000 (15:17 +0100)]
avfilter/vf_qp: split expression parsing out of loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaf_channelmap: fix number of channels
Marton Balint [Sat, 28 Mar 2015 09:07:07 +0000 (10:07 +0100)]
af_channelmap: fix number of channels

Fixes segfaults with the following command:

ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/qsv_internal: Fix project name
Michael Niedermayer [Sat, 28 Mar 2015 02:42:29 +0000 (03:42 +0100)]
avcodec/qsv_internal: Fix project name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples: add directory listing example
Lukasz Marek [Sat, 5 Jul 2014 16:12:04 +0000 (18:12 +0200)]
doc/examples: add directory listing example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc: Removed unecessary if/else branch when getting QP.
Tucker DiNapoli [Fri, 27 Mar 2015 20:51:43 +0000 (16:51 -0400)]
postproc: Removed unecessary if/else branch when getting QP.

There's still an if, as QP needs to be modified if isColor=0, but it
still removes a unecessary branch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
Michael Niedermayer [Sat, 28 Mar 2015 00:33:27 +0000 (01:33 +0100)]
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'

* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9ba27c2348d26000257e891e40a72facb0d916be'
Michael Niedermayer [Sat, 28 Mar 2015 00:25:16 +0000 (01:25 +0100)]
Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'

* commit '9ba27c2348d26000257e891e40a72facb0d916be':
  qsvdec: add 'decode' to the non-static function names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
Michael Niedermayer [Sat, 28 Mar 2015 00:16:21 +0000 (01:16 +0100)]
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'

* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder

Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
Michael Niedermayer [Sat, 28 Mar 2015 00:03:23 +0000 (01:03 +0100)]
Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'

* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Use a variable QP input for fate-filter-pp
Michael Niedermayer [Fri, 27 Mar 2015 23:25:18 +0000 (00:25 +0100)]
fate: Use a variable QP input for fate-filter-pp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: simplify filter-pp tests
Michael Niedermayer [Fri, 27 Mar 2015 23:16:24 +0000 (00:16 +0100)]
fate: simplify filter-pp tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: add Intel libmfx-based H.264 encoder
Anton Khirnov [Fri, 13 Mar 2015 09:20:31 +0000 (10:20 +0100)]
lavc: add Intel libmfx-based H.264 encoder

4 years agoqsvdec: add 'decode' to the non-static function names
Anton Khirnov [Fri, 13 Mar 2015 07:21:38 +0000 (08:21 +0100)]
qsvdec: add 'decode' to the non-static function names

4 years agoqsvdec: split off some code that will be shared with the encoder
Anton Khirnov [Fri, 13 Mar 2015 07:13:00 +0000 (08:13 +0100)]
qsvdec: split off some code that will be shared with the encoder

4 years agoqsv: rename to qsvdec
Anton Khirnov [Fri, 13 Mar 2015 06:55:53 +0000 (07:55 +0100)]
qsv: rename to qsvdec

This is to avoid conflicts with the upcoming QSV encoding support.

4 years agoavformat/avio: Document the end of list case in avio_read_dir()
Michael Niedermayer [Fri, 27 Mar 2015 20:17:30 +0000 (21:17 +0100)]
avformat/avio: Document the end of list case in avio_read_dir()

This was mentioned in a previous review

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi: add inverse telecine filter
Himangi Saraogi [Fri, 27 Mar 2015 14:06:05 +0000 (19:36 +0530)]
lavfi: add inverse telecine filter

Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: add directory listing API
Lukasz Marek [Sat, 5 Jul 2014 16:11:59 +0000 (18:11 +0200)]
lavf: add directory listing API

API allows protocol implementations to provide API that
allows to list directory content.
API is similar to POSIX opendir/readdir/closedir.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_telecine: Avoid floating point values
Himangi Saraogi [Fri, 27 Mar 2015 14:05:12 +0000 (19:35 +0530)]
avfilter/vf_telecine: Avoid floating point values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/timer: give each printed value of STOP_TIMER a fixed length
Michael Niedermayer [Sun, 22 Mar 2015 15:15:03 +0000 (16:15 +0100)]
avutil/timer: give each printed value of STOP_TIMER a fixed length

this makes the result easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/timer: show histogram of cpu cycles each run took
Michael Niedermayer [Sun, 22 Mar 2015 15:11:08 +0000 (16:11 +0100)]
avutil/timer: show histogram of cpu cycles each run took

The new information is printed at verbose log level and can thus be switched on and off
through the log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/cpu: add missing check for mmxext to av_force_cpu_flags
James Almer [Thu, 26 Mar 2015 05:11:55 +0000 (02:11 -0300)]
avutil/cpu: add missing check for mmxext to av_force_cpu_flags

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/vf_telecine: Fix loss of AVFrame properties in output
Himangi Saraogi [Thu, 26 Mar 2015 23:04:39 +0000 (04:34 +0530)]
avfilter/vf_telecine: Fix loss of AVFrame properties in output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/x86/hpeldsp_init: Put CONFIG_* first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:30:20 +0000 (15:30 +0100)]
avcodec/x86/hpeldsp_init: Put CONFIG_* first in if()

This is more consistent and may fix a build failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Put CONFIG_GRAY first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:30:20 +0000 (15:30 +0100)]
avcodec/h264_slice: Put CONFIG_GRAY first in if()

This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:29:54 +0000 (15:29 +0100)]
avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()

This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ac3dec: Put CONFIG* first in if()
Michael Niedermayer [Thu, 26 Mar 2015 14:29:03 +0000 (15:29 +0100)]
avcodec/ac3dec: Put CONFIG* first in if()

This may fix build failures with EAC3 disabled and is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dv: fix used dimension variables
Michael Niedermayer [Thu, 26 Mar 2015 02:10:27 +0000 (03:10 +0100)]
avformat/dv: fix used dimension variables

Fixes null pointer dereference during seeking
Fixes Ticket4395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rmdec: fix support for 0 sized mdpr
Michael Niedermayer [Thu, 26 Mar 2015 01:02:18 +0000 (02:02 +0100)]
avformat/rmdec: fix support for 0 sized mdpr

Fixes Ticket4393

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_telecine: Fix AV desync by using the first input timestamp
Himangi Saraogi [Wed, 25 Mar 2015 23:05:28 +0000 (04:35 +0530)]
avfilter/vf_telecine: Fix AV desync by using the first input timestamp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nvenc: Need a separate class for each encoder
Philip Langdale [Wed, 25 Mar 2015 22:24:30 +0000 (15:24 -0700)]
avcodec/nvenc: Need a separate class for each encoder

The encoders can't share a class instance.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agodoc: remove the reference to supporting AviSynth 2.5
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:31 +0000 (15:23 -0400)]
doc: remove the reference to supporting AviSynth 2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: drop support of AviSynth 2.5
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:30 +0000 (15:23 -0400)]
avisynth: drop support of AviSynth 2.5

If the user attempts to use AviSynth 2.5, an error message will
now tell them they need to upgrade.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/output: Fix undefined shifts
Michael Niedermayer [Wed, 25 Mar 2015 17:30:00 +0000 (18:30 +0100)]
swscale/output: Fix undefined shifts

Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: ifdef to avoid implicit function declaration errors
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:32 +0000 (15:23 -0400)]
avisynth: ifdef to avoid implicit function declaration errors

The demuxer doesn't use these functions, so it shouldn't affect
anything.  Investigate whether this can be fixed by how headers
are checked in configure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/j2kenc: Initialize variable to silence compiler warnings
Himangi Saraogi [Wed, 25 Mar 2015 13:32:16 +0000 (19:02 +0530)]
avcodec/j2kenc: Initialize variable to silence compiler warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: make AVFrameSideData buffers ref-counted.
Ronald S. Bultje [Mon, 23 Mar 2015 15:11:19 +0000 (11:11 -0400)]
avutil: make AVFrameSideData buffers ref-counted.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavu/frame: move av_frame_copy_props() up in the file.
Ronald S. Bultje [Mon, 23 Mar 2015 15:11:18 +0000 (11:11 -0400)]
lavu/frame: move av_frame_copy_props() up in the file.

Preparation for following patch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nvenc_h265: add missing version bump and changelog entry
James Almer [Wed, 25 Mar 2015 06:58:13 +0000 (03:58 -0300)]
avcodec/nvenc_h265: add missing version bump and changelog entry

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoconfigure: add missing dependency for nvenc_h265
James Almer [Wed, 25 Mar 2015 06:49:30 +0000 (03:49 -0300)]
configure: add missing dependency for nvenc_h265

Should fix compilation of builds without nvenc

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/nvenc: Add support for H.265 encoding
Philip Langdale [Tue, 24 Mar 2015 04:34:59 +0000 (21:34 -0700)]
avcodec/nvenc: Add support for H.265 encoding

Sufficiently new nvenc hardware (GM20x or later) has support for H.265
encoding. This works the same as the H.264 encoder except the
codec parameters are different.

Due to the fact that common codec parameters are not shareable, there's
quite a bit of conditional logic you'd wish we could do without, but
such is life.

Signed-off-by: Philip Langdale <philipl@overt.org>
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
4 years agoavcodec/h264: Remove bits_per_raw_sample hacks
Michael Niedermayer [Wed, 25 Mar 2015 02:45:32 +0000 (03:45 +0100)]
avcodec/h264: Remove bits_per_raw_sample hacks

Fixes assertion failure

Fixes: f12c79769501ee471a5c731b8304ffcb/signal_sigabrt_7ffff6ac8cc9_3766_cov_4267830138_undemuxable_h264.ts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: update headers against AviSynth+
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:29 +0000 (15:23 -0400)]
avisynth: update headers against AviSynth+

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: fix option name in documentation
Giorgio Vazzana [Tue, 24 Mar 2015 19:20:45 +0000 (20:20 +0100)]
ffmpeg: fix option name in documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings during...
Michael Niedermayer [Mon, 23 Mar 2015 20:18:42 +0000 (21:18 +0100)]
avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings during parsing

Fixes: AVCI100_Test.mxf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Add missing AV_ prefix to PIX_FMT_YUV411P
Michael Niedermayer [Tue, 24 Mar 2015 16:36:39 +0000 (17:36 +0100)]
avutil/pixfmt: Add missing AV_ prefix to PIX_FMT_YUV411P

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nvenc: Drop support for old nvenc api
Timo Rothenpieler [Tue, 24 Mar 2015 09:26:57 +0000 (10:26 +0100)]
avcodec/nvenc: Drop support for old nvenc api

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/msrledec: More verbose error message
Michael Niedermayer [Tue, 24 Mar 2015 14:53:24 +0000 (15:53 +0100)]
avcodec/msrledec: More verbose error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead...
Michael Niedermayer [Tue, 24 Mar 2015 14:50:12 +0000 (15:50 +0100)]
avcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead of the pixel pointer

Fixes out of array access
Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: check color parameter type explicitly.
Jochen Strunk [Tue, 24 Mar 2015 09:39:27 +0000 (10:39 +0100)]
avformat/mov: check color parameter type explicitly.

Fixes ticket #4387.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Note, Vittorio Giovara had submitted a very similar fix to me privately
a few hours before this, iam applying Jochens because it comes with a
commit message too and i had not yet applied Vittorios, but For sake
of credit, Vittorio independently solved this first

4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 24 Mar 2015 11:47:13 +0000 (12:47 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328'
Michael Niedermayer [Tue, 24 Mar 2015 10:54:38 +0000 (11:54 +0100)]
Merge commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328'

* commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328':
  avisynth: update documentation about the avisynth_c.h header

Conflicts:
doc/general.texi

Not merged as FFmpeg provides the needed headers in compat/

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'
Michael Niedermayer [Tue, 24 Mar 2015 10:24:21 +0000 (11:24 +0100)]
Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'

* commit 'a8c99205ca8703bd849efae13fcf844315c7147d':
  avisynth: Fix compilation against current 2.6 header(s).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: update documentation about the avisynth_c.h header
Stephen Hutchinson [Fri, 13 Mar 2015 02:52:30 +0000 (22:52 -0400)]
avisynth: update documentation about the avisynth_c.h header

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavisynth: Fix compilation against current 2.6 header(s).
Stephen Hutchinson [Fri, 13 Mar 2015 02:52:29 +0000 (22:52 -0400)]
avisynth: Fix compilation against current 2.6 header(s).

AviSynth 2.6 (and by extension, AviSynth+) moves these functions
into AVSC_API. This requires both adjusting their normal use,
and for AvxSynth, adjusting the position/use of the USING_AVISYNTH
ifdefs.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Carl Eugen Hoyos [Mon, 23 Mar 2015 23:04:43 +0000 (00:04 +0100)]
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.

Fixes remuxing of DVBSUB to mkv.

4 years agodoc: Remove non-existing decklink options.
Carl Eugen Hoyos [Tue, 24 Mar 2015 08:53:29 +0000 (09:53 +0100)]
doc: Remove non-existing decklink options.

Reported-by: Bostjan Hamler
4 years agoMerge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f'
Michael Niedermayer [Tue, 24 Mar 2015 01:47:50 +0000 (02:47 +0100)]
Merge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f'

* commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f':
  vaapi_h264: fix slice data offset

See: aba3030a5593ceb0b9390cbc4c58642f372a17a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ae4f5d944cce431b1f4715c863122355e1d78007'
Michael Niedermayer [Tue, 24 Mar 2015 01:30:47 +0000 (02:30 +0100)]
Merge commit 'ae4f5d944cce431b1f4715c863122355e1d78007'

* commit 'ae4f5d944cce431b1f4715c863122355e1d78007':
  dxva2_h264: fix slice offset in long slice structs

See: cf1fba0fb83ba4d6ddd0a2432ea5e5e6f8c10aa2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b21af32aed7e343f962753943e9f16baedfb1750'
Michael Niedermayer [Tue, 24 Mar 2015 01:06:44 +0000 (02:06 +0100)]
Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'

* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
  lavc: Prefer x264 over openh264 if both libraries are available

See: ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8'
Michael Niedermayer [Tue, 24 Mar 2015 00:55:19 +0000 (01:55 +0100)]
Merge commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8'

* commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8':
  pixfmt: Update documentation with prefixed pixel formats

Conflicts:
libavutil/pixfmt.h

See: 231e33f050386e170cba33188df7b822b16ca099
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '592a04054e6423be5050efd2bceece48b10b9c1d'
Michael Niedermayer [Tue, 24 Mar 2015 00:45:43 +0000 (01:45 +0100)]
Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'

* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
  pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:
libavutil/pixdesc.c

See: c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7419b34825c20d52f667da2fbe4dc710ec8398f8'
Michael Niedermayer [Tue, 24 Mar 2015 00:24:04 +0000 (01:24 +0100)]
Merge commit '7419b34825c20d52f667da2fbe4dc710ec8398f8'

* commit '7419b34825c20d52f667da2fbe4dc710ec8398f8':
  fate: Add test for tscc2 in mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
Michael Niedermayer [Tue, 24 Mar 2015 00:14:31 +0000 (01:14 +0100)]
Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'

* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
  mov: Write the display matrix in order

Conflicts:
libavformat/mov.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfenc: add container duration and package name to primer pack
Mark Reid [Sat, 21 Mar 2015 23:45:27 +0000 (16:45 -0700)]
libavformat/mxfenc: add container duration and package name to primer pack

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovaapi_h264: fix slice data offset
Hendrik Leppkes [Mon, 23 Mar 2015 13:16:45 +0000 (14:16 +0100)]
vaapi_h264: fix slice data offset

4 years agodxva2_h264: fix slice offset in long slice structs
Hendrik Leppkes [Mon, 23 Mar 2015 13:16:44 +0000 (14:16 +0100)]
dxva2_h264: fix slice offset in long slice structs

4 years agolavc: Prefer x264 over openh264 if both libraries are available
Michael Niedermayer [Tue, 17 Mar 2015 14:16:58 +0000 (14:16 +0000)]
lavc: Prefer x264 over openh264 if both libraries are available

4 years agopixfmt: Update documentation with prefixed pixel formats
Vittorio Giovara [Wed, 18 Mar 2015 11:10:40 +0000 (11:10 +0000)]
pixfmt: Update documentation with prefixed pixel formats

4 years agopixdesc: Replace a few leftover instances of non AV-prefixed flags
Vittorio Giovara [Wed, 18 Mar 2015 11:10:39 +0000 (11:10 +0000)]
pixdesc: Replace a few leftover instances of non AV-prefixed flags

4 years agofate: Add test for tscc2 in mov
Vittorio Giovara [Wed, 18 Mar 2015 00:48:18 +0000 (00:48 +0000)]
fate: Add test for tscc2 in mov

Rename the existing tscc2 test.

4 years agomov: Write the display matrix in order
Vittorio Giovara [Tue, 17 Mar 2015 17:38:48 +0000 (17:38 +0000)]
mov: Write the display matrix in order

This will allow to copy the matrix as is and it is just cleaner to keep
the matrix in the same order specified by the mov standard (which is
also explicitly described in the documentation).

In order to preserve compatibility, flip the angle sign in the display API
av_display_rotation_set() and av_display_rotation_get(), and improve the
documentation mentioning the rotation direction.

4 years agoMerge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'
Michael Niedermayer [Mon, 23 Mar 2015 19:33:09 +0000 (20:33 +0100)]
Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'

* commit 'e0046bc9c96150fa06146ace9093f06857dd7b23':
  movenc: Write the make and model metadata keys for mov style files

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_stereo3d: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
avfilter/vf_stereo3d: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/frame: Add some very basic documentation for AVFrameSideData
Michael Niedermayer [Mon, 23 Mar 2015 17:34:30 +0000 (18:34 +0100)]
avutil/frame: Add some very basic documentation for AVFrameSideData

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: Use @lisp where appropriate
Timothy Gu [Mon, 23 Mar 2015 03:47:19 +0000 (20:47 -0700)]
doc: Use @lisp where appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: More semantic markup using @samp and @var where appropriate
Timothy Gu [Mon, 23 Mar 2015 03:47:18 +0000 (20:47 -0700)]
doc: More semantic markup using @samp and @var where appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovaapi_h264: fix slice data offset
Hendrik Leppkes [Mon, 23 Mar 2015 14:58:27 +0000 (15:58 +0100)]
vaapi_h264: fix slice data offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2_h264: fix slice offset in long slice structs
Hendrik Leppkes [Mon, 23 Mar 2015 14:58:26 +0000 (15:58 +0100)]
dxva2_h264: fix slice offset in long slice structs

Fixes Ticket #4384

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/fate: better formatting
Timothy Gu [Mon, 23 Mar 2015 03:47:16 +0000 (20:47 -0700)]
doc/fate: better formatting

The initial spaces get ignored anyway so let's be consistent with other docs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Write the make and model metadata keys for mov style files
Martin Storsjö [Fri, 21 Nov 2014 22:53:42 +0000 (00:53 +0200)]
movenc: Write the make and model metadata keys for mov style files

These are essential allowing QuickTime to keep detecting content
as slow-motion - this allows preserving them on stream copy.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agopostproc/postprocess_template: split 2nd blockgroup loop out
Michael Niedermayer [Sun, 22 Mar 2015 23:41:41 +0000 (00:41 +0100)]
postproc/postprocess_template: split 2nd blockgroup loop out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc/postprocess_template: split first part of block loop
Michael Niedermayer [Sun, 22 Mar 2015 23:26:42 +0000 (00:26 +0100)]
postproc/postprocess_template: split first part of block loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc/postprocess_template: Move QP initialization down
Michael Niedermayer [Sun, 22 Mar 2015 23:24:46 +0000 (00:24 +0100)]
postproc/postprocess_template: Move QP initialization down

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc/postprocess_template: Remove dead code and comments
Michael Niedermayer [Sun, 22 Mar 2015 23:22:43 +0000 (00:22 +0100)]
postproc/postprocess_template: Remove dead code and comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobpostproc/postprocess_template: drop avoidable #ifdef
Michael Niedermayer [Sun, 22 Mar 2015 23:16:07 +0000 (00:16 +0100)]
bpostproc/postprocess_template: drop avoidable #ifdef

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc/postprocess_template: split loop in 2 (block groups of 4, blocks)
Michael Niedermayer [Sun, 22 Mar 2015 23:02:51 +0000 (00:02 +0100)]
postproc/postprocess_template: split loop in 2 (block groups of 4, blocks)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snow: fix support for odd dimensions
Michael Niedermayer [Sun, 22 Mar 2015 22:07:03 +0000 (23:07 +0100)]
avcodec/snow: fix support for odd dimensions

Fixes Ticket3914

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jpeglsdec: support PAL1-PAL7
Michael Niedermayer [Sun, 22 Mar 2015 19:31:03 +0000 (20:31 +0100)]
avcodec/jpeglsdec: support PAL1-PAL7

Fixes Ticket3933

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_signalstats: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Sun, 22 Mar 2015 16:31:34 +0000 (17:31 +0100)]
avfilter/vf_signalstats: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Sun, 22 Mar 2015 16:23:38 +0000 (17:23 +0100)]
avfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avformat/flvenc: Allow muxing video codecs which are not explicitly supported...
Michael Niedermayer [Sun, 22 Mar 2015 16:19:25 +0000 (17:19 +0100)]
Revert "avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer"

This commit has no known use case ATM as there are no unsupported video codecs in flv and could
theoretically be use to generate broken files allthough that would be not entirely easy as
tags/codecs still get sanity checked

This reverts commit 76f4b117807c30a528539fc5c7a7e35cb288cfcf.

4 years agoavformat/flvenc: Allow muxing video codecs which are not explicitly supported by...
Michael Niedermayer [Fri, 6 Mar 2015 01:51:14 +0000 (02:51 +0100)]
avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer

This allows stream copying video codecs before they are explicitly
supported. The same feature was in the past useful for audio codecs
in flv

This partly reverts the changes from 735ab7c5e04e2316afbd56643c13de17a7ac89cd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_cavlc: Drop local_ref_count
Michael Niedermayer [Sun, 22 Mar 2015 13:30:51 +0000 (14:30 +0100)]
avcodec/h264_cavlc: Drop local_ref_count

This basically switches to the implementation from f6f7d1504134683c435e2c7d804279d982e52bb4
which seems faster

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