ffmpeg.git
6 years agoalpha/blockdsp: move clear_blocks out of dsputil
James Almer [Thu, 19 Jun 2014 20:28:26 +0000 (17:28 -0300)]
alpha/blockdsp: move clear_blocks out of dsputil

The blockdsp split did not cover Alpha optimizations

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: better probing for duration in estimate_timings_from_pts()
Gaullier Nicolas [Thu, 19 Jun 2014 17:26:31 +0000 (17:26 +0000)]
avformat/utils: better probing for duration in estimate_timings_from_pts()

It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: Use named identifier for single thread fall-back return from ff_h264_de...
Michael Niedermayer [Thu, 19 Jun 2014 17:49:26 +0000 (19:49 +0200)]
avcodec/h264: Use named identifier for single thread fall-back return from ff_h264_decode_slice_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agos86/scale: Do not return the result of a (void) function from a void function.
Carl Eugen Hoyos [Thu, 19 Jun 2014 16:45:13 +0000 (18:45 +0200)]
s86/scale: Do not return the result of a (void) function from a void function.

Fixes compilation with Sun C 5.12.
Reported by Bradley Mitchell in ticket #3649.

6 years agox86/blockdsp: restore author attribution
James Almer [Thu, 19 Jun 2014 16:29:43 +0000 (13:29 -0300)]
x86/blockdsp: restore author attribution

See commits
649c00c96d7044aed46d70623e47d7434318e6b9
5fecfb7d58a12baf326e99f2d071060f2638d93c
73b02e24604961e49a63ca34203d8f6c56612117

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '852c329a69ddfd635807f60454df07d021c64901'
Michael Niedermayer [Thu, 19 Jun 2014 16:00:20 +0000 (18:00 +0200)]
Merge commit '852c329a69ddfd635807f60454df07d021c64901'

* commit '852c329a69ddfd635807f60454df07d021c64901':
  configure: Drop duplicate pkg-config entry from help output

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Drop duplicate pkg-config entry from help output
Diego Biurrun [Wed, 18 Jun 2014 14:45:45 +0000 (16:45 +0200)]
configure: Drop duplicate pkg-config entry from help output

6 years agoMerge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'
Michael Niedermayer [Thu, 19 Jun 2014 13:12:22 +0000 (15:12 +0200)]
Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'

* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add simpleauto idct
Michael Niedermayer [Sat, 14 Jun 2014 16:55:27 +0000 (18:55 +0200)]
avcodec: add simpleauto idct

This will pick the "best" simple idct compatible idct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/Makefile: fix standalone compilation of live_flv demuxer
James Almer [Thu, 19 Jun 2014 05:50:32 +0000 (02:50 -0300)]
lavf/Makefile: fix standalone compilation of live_flv demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix NASM output format on Win64
James Almer [Thu, 19 Jun 2014 05:25:51 +0000 (02:25 -0300)]
configure: fix NASM output format on Win64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_idct: fix movd parameter size in DC_ADD_INIT
James Almer [Thu, 19 Jun 2014 04:10:43 +0000 (01:10 -0300)]
x86/hevc_idct: fix movd parameter size in DC_ADD_INIT

Fixes compilation with NASM x86_64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoi263: skip dummy frames
Dirk Ausserhaus [Wed, 18 Jun 2014 08:01:52 +0000 (10:01 +0200)]
i263: skip dummy frames

Intel i263 codec has special 8-byte dummy frames that should not be decoded,
so do not even attempt to decode them and skip them instead.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agox86/blockdsp: move asm code out of dsputil
James Almer [Thu, 19 Jun 2014 04:00:17 +0000 (01:00 -0300)]
x86/blockdsp: move asm code out of dsputil

Also replace INLINE_<opt> with EXTERNAL_<opt> that were wrongly
changed by commit 2b05db4f8102148d013755ac2a7e47f6d79ff7ca

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohuffyuv: change statistics initialization
Christophe Gisquet [Wed, 11 Jun 2014 20:15:12 +0000 (22:15 +0200)]
huffyuv: change statistics initialization

Normally, a Laplace distribution is more typical of the residuals
encoded, but for noisy input, it's both better and simpler to be
safe and use a 1/d^2 distribution. Second hunk could use some
renormalization but it has effectively little impact.

Output size of ffvhuff on various 4:2:0 sequences:
context=0,1/d:    851974   27226   1137281
context=0,1/d²:   619081   25069   1051500
context=0,1/d³:   501983   30454   1290561
context=0,lapl:   500650   31754   1304082

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/lossless_videodsp: Fix size of values read for left/left_top
Michael Niedermayer [Thu, 19 Jun 2014 03:53:41 +0000 (05:53 +0200)]
avcodec/x86/lossless_videodsp: Fix size of values read for left/left_top

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
Michael Niedermayer [Thu, 19 Jun 2014 02:41:48 +0000 (04:41 +0200)]
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
  dsputil: Split clear_block*/fill_block* off into a separate context

Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoppc: Fix the bug of fft for little endian environment on POWER7 and later
Rong Yan [Wed, 18 Jun 2014 08:51:35 +0000 (04:51 -0400)]
ppc: Fix the bug of fft for little endian environment on POWER7 and later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '869fc416f7c78ed4e397e0208acd1545771c0502'
Michael Niedermayer [Wed, 18 Jun 2014 21:32:48 +0000 (23:32 +0200)]
Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502'

* commit '869fc416f7c78ed4e397e0208acd1545771c0502':
  hevc: Mark num_bins_in_se as unused

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'
Michael Niedermayer [Wed, 18 Jun 2014 21:26:37 +0000 (23:26 +0200)]
Merge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'

* commit 'c385313d2590fd26e26bb9bdacddef78162ab490':
  rtsp: Support misordered fmtp rtpmap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'
Michael Niedermayer [Wed, 18 Jun 2014 21:22:08 +0000 (23:22 +0200)]
Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'

* commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371':
  rtsp: Factor out fmtp parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'
Michael Niedermayer [Wed, 18 Jun 2014 21:09:35 +0000 (23:09 +0200)]
Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'

* commit '49a242687cf44f86570b706db3c5912ff06bc6c2':
  doc: Document segment_list_type

Conflicts:
doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: Split clear_block*/fill_block* off into a separate context
Diego Biurrun [Tue, 14 Jan 2014 09:33:47 +0000 (10:33 +0100)]
dsputil: Split clear_block*/fill_block* off into a separate context

6 years agodoc/bitstream_filters: document imxdump
Lou Logan [Mon, 9 Jun 2014 20:19:02 +0000 (12:19 -0800)]
doc/bitstream_filters: document imxdump

Partially addresses ticket #3198.

Signed-off-by: Lou Logan <lou@lrcd.com>
Tested-by: Dave Rice <dave@dericed.com>
6 years agohevc: Mark num_bins_in_se as unused
Luca Barbato [Wed, 18 Jun 2014 14:20:48 +0000 (16:20 +0200)]
hevc: Mark num_bins_in_se as unused

Only its size is actually used. Silence a clang warning.

6 years agortsp: Support misordered fmtp rtpmap
Joshua Kordani [Tue, 17 Jun 2014 00:49:46 +0000 (02:49 +0200)]
rtsp: Support misordered fmtp rtpmap

Issue present in Avigilon IP cameras.

6 years agortsp: Factor out fmtp parsing
Luca Barbato [Tue, 17 Jun 2014 00:36:55 +0000 (02:36 +0200)]
rtsp: Factor out fmtp parsing

6 years agodoc: Document segment_list_type
Luca Barbato [Mon, 16 Jun 2014 11:56:08 +0000 (13:56 +0200)]
doc: Document segment_list_type

6 years agoffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams
Michael Niedermayer [Tue, 10 Jun 2014 15:51:58 +0000 (17:51 +0200)]
ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams

This allows "-codec copy -f framecrc" on files with only unindentifyable streams

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mux: simplify ff_choose_timebase()
Michael Niedermayer [Wed, 18 Jun 2014 18:09:55 +0000 (20:09 +0200)]
avformat/mux: simplify ff_choose_timebase()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodump_stream_format: fix division by 0
Michael Niedermayer [Wed, 18 Jun 2014 17:25:36 +0000 (19:25 +0200)]
dump_stream_format: fix division by 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '194be1f43ea391eb986732707435176e579265aa'
Michael Niedermayer [Wed, 18 Jun 2014 16:18:25 +0000 (18:18 +0200)]
Merge commit '194be1f43ea391eb986732707435176e579265aa'

* commit '194be1f43ea391eb986732707435176e579265aa':
  lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ass: move playres parameters below scripttype
Clément Bœsch [Wed, 18 Jun 2014 16:37:59 +0000 (18:37 +0200)]
avcodec/ass: move playres parameters below scripttype

Suggested-by: wm4
6 years agoavcodec/ass: explicit PlayRes[XY]
Clément Bœsch [Wed, 18 Jun 2014 16:12:11 +0000 (18:12 +0200)]
avcodec/ass: explicit PlayRes[XY]

This avoids the following libass warning when using the subtitles
filter: "Neither PlayResX nor PlayResY defined. Assuming 384x288"

Subtitles tests change because the output is ASS and the PlayRes[XY]
ends up in the output.

6 years agoMerge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
Michael Niedermayer [Wed, 18 Jun 2014 15:47:12 +0000 (17:47 +0200)]
Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'

* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
  riffenc: take an AVStream instead of an AVCodecContext

Conflicts:
libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'
Michael Niedermayer [Wed, 18 Jun 2014 15:28:10 +0000 (17:28 +0200)]
Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228':
  lavf: add the notimestamps flag to the muxers missing it

Conflicts:
libavformat/adtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'
Michael Niedermayer [Wed, 18 Jun 2014 15:21:28 +0000 (17:21 +0200)]
Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'

* commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016':
  rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'
Michael Niedermayer [Wed, 18 Jun 2014 15:11:17 +0000 (17:11 +0200)]
Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'

* commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378':
  Remove avserver.

Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffserver.conf
doc/ffserver.texi
doc/general.texi
ffserver.c
libavformat/Makefile
libavformat/ffm.h
libavformat/ffmdec.c
libavformat/ffmenc.c
tests/fate/avformat.mak
tests/lavf-regression.sh
tests/ref/lavf/ffm
tests/ref/seek/lavf-ffm

Not merged, ffserver does have a maintainer
co maintainers are welcome and needed though !

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvdec: do not leave alpha values uninitialized
Michael Niedermayer [Wed, 18 Jun 2014 14:46:56 +0000 (16:46 +0200)]
avcodec/huffyuvdec: do not leave alpha values uninitialized

fixes fate failure under valgrind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: switch to AVStream.time_base as the hint for the muxer timebase
Anton Khirnov [Sun, 18 May 2014 10:12:59 +0000 (12:12 +0200)]
lavf: switch to AVStream.time_base as the hint for the muxer timebase

Previously, AVStream.codec.time_base was used for that purpose, which
was quite confusing for the callers. This change also opens the path for
removing AVStream.codec.

The change in the lavf-mkv test is due to the native timebase (1/1000)
being used instead of the default one (1/90000), so the packets are now
sent to the crc muxer in the same order in which they are demuxed
(previously some of them got reordered because of inexact timestamp
conversion).

6 years agoriffenc: take an AVStream instead of an AVCodecContext
Anton Khirnov [Fri, 30 May 2014 05:17:28 +0000 (07:17 +0200)]
riffenc: take an AVStream instead of an AVCodecContext

It will be useful in the following commits.

Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.

6 years agolavf: add the notimestamps flag to the muxers missing it
Anton Khirnov [Thu, 29 May 2014 05:06:52 +0000 (07:06 +0200)]
lavf: add the notimestamps flag to the muxers missing it

6 years agortpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase
Anton Khirnov [Thu, 29 May 2014 05:58:35 +0000 (07:58 +0200)]
rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase

Fall back to 1 (which is what is used for most cases anyway) when the
framerate is not set.

6 years agoRemove avserver.
Anton Khirnov [Mon, 9 Jun 2014 12:21:56 +0000 (14:21 +0200)]
Remove avserver.

It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.

6 years agoRevert "Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed."
Carl Eugen Hoyos [Wed, 18 Jun 2014 12:31:39 +0000 (14:31 +0200)]
Revert "Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed."

It broke gas-preprocessor detection on PPC64 Linux.
This reverts commit b67bcd784dde7ad2b1a167ce7ffef14f8a0c8074.

6 years agoswr: remove div/mod from DSP functions.
Ronald S. Bultje [Wed, 18 Jun 2014 11:26:03 +0000 (07:26 -0400)]
swr: remove div/mod from DSP functions.

Also fix a bug with resample_compensation resetting dst_incr.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix all VDPAU decoders.
Carl Eugen Hoyos [Wed, 18 Jun 2014 09:35:33 +0000 (11:35 +0200)]
Fix all VDPAU decoders.

Fixes ticket #3726.

6 years agoavcodec/dcadec: remove unsignedness from constant
Michael Niedermayer [Wed, 18 Jun 2014 11:07:57 +0000 (13:07 +0200)]
avcodec/dcadec: remove unsignedness from constant

POSIX gurantees >=32bit so it all fits in signed int
Also >=32bit ints are assumed througout the codebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'
Michael Niedermayer [Wed, 18 Jun 2014 11:03:42 +0000 (13:03 +0200)]
Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'

* commit 'f2ce63246f5c934429f9cb857a794e07624d7912':
  dcadec: replace ldexpf with a multiplication by a constant

Conflicts:
libavcodec/dcadec.c

See: 6da06ef6bbc01b713f67ffb94e7697eb2393ebe4
See: 9ccb5455ca8c63eb330abd3c2ed6a9b0ae3b755e
See: 6b88f22e895314164eef00ccbdbf11ad97a7c56f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '44671b57866aab8dd36715ff010e985e25baaf19'
Michael Niedermayer [Wed, 18 Jun 2014 10:53:35 +0000 (12:53 +0200)]
Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'

* commit '44671b57866aab8dd36715ff010e985e25baaf19':
  AVFrame: factor out freeing the side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: replace ldexpf with a multiplication by a constant
Niels Möller [Wed, 18 Jun 2014 06:23:15 +0000 (08:23 +0200)]
dcadec: replace ldexpf with a multiplication by a constant

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoAVFrame: factor out freeing the side data
Roman Savchenko [Wed, 18 Jun 2014 06:11:05 +0000 (08:11 +0200)]
AVFrame: factor out freeing the side data

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoswscale/swscale: replace potentially slow % by &
Michael Niedermayer [Wed, 18 Jun 2014 02:24:31 +0000 (04:24 +0200)]
swscale/swscale: replace potentially slow % by &

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/cavsdec: simplify % 512 operations
Michael Niedermayer [Wed, 18 Jun 2014 02:18:40 +0000 (04:18 +0200)]
avcodec/cavsdec: simplify % 512 operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample/audioconvert: fix () in FMT_PAIR_FUNC()
Michael Niedermayer [Wed, 18 Jun 2014 01:00:50 +0000 (03:00 +0200)]
swresample/audioconvert: fix () in FMT_PAIR_FUNC()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8: fix () in macros
Michael Niedermayer [Wed, 18 Jun 2014 00:55:49 +0000 (02:55 +0200)]
avcodec/vp8: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp9: fix () in macros
Michael Niedermayer [Wed, 18 Jun 2014 00:55:35 +0000 (02:55 +0200)]
avcodec/vp9: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wavpack: fix () in macros
Michael Niedermayer [Wed, 18 Jun 2014 00:54:57 +0000 (02:54 +0200)]
avcodec/wavpack: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopresets: remove moldering iPod presets
Lou Logan [Tue, 17 Jun 2014 18:48:20 +0000 (10:48 -0800)]
presets: remove moldering iPod presets

* Some users are trying to use them for non-ancient iDevices when
  baseline profile and level 1.3/3.0 would not be required.

* "640" and "320" no longer make sense.

* Some recommended options can be viewed at:
  <https://trac.ffmpeg.org/wiki/Encode/H.264#iOS>

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9affa784a0743b95bde135b5acfce2183afc35d8'
Michael Niedermayer [Tue, 17 Jun 2014 23:54:02 +0000 (01:54 +0200)]
Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'

* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
  vp9 encoder: use a decent default speed setting

Conflicts:
libavcodec/libvpxenc.c

See: 34e32d6464135a03da14d5b0aef1d42796939eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '74bc9458057f07c0820c3d3264396c4c64442e47'
Michael Niedermayer [Tue, 17 Jun 2014 23:44:24 +0000 (01:44 +0200)]
Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'

* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '49106844929b7b71ac719064d640f8aa56c89b1f'
Michael Niedermayer [Tue, 17 Jun 2014 23:29:19 +0000 (01:29 +0200)]
Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'

* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
  tiffenc: fix packet size calculation

Conflicts:
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_spp: Use av_malloc_array()
Michael Niedermayer [Tue, 17 Jun 2014 22:07:30 +0000 (00:07 +0200)]
avfilter/vf_spp: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_sab: use av_malloc_array()
Michael Niedermayer [Tue, 17 Jun 2014 22:07:12 +0000 (00:07 +0200)]
vf_sab: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9 encoder: use a decent default speed setting
Rafaël Carré [Fri, 6 Jun 2014 18:06:43 +0000 (11:06 -0700)]
vp9 encoder: use a decent default speed setting

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoflvenc: Don't over-count metadata.
Josh Allmann [Wed, 11 Jun 2014 01:45:07 +0000 (18:45 -0700)]
flvenc: Don't over-count metadata.

Over-counting occurs if framerate is not set.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agotiffenc: fix packet size calculation
Tristan Matthews [Fri, 13 Jun 2014 14:57:12 +0000 (10:57 -0400)]
tiffenc: fix packet size calculation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoMerge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'
Michael Niedermayer [Tue, 17 Jun 2014 18:42:10 +0000 (20:42 +0200)]
Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'

* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
  jpeg2000: Mark static data init functions as av_cold

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: Mark static data init functions as av_cold
Diego Biurrun [Fri, 13 Jun 2014 12:38:44 +0000 (05:38 -0700)]
jpeg2000: Mark static data init functions as av_cold

6 years agoffplay: remove -ec handling code
Michael Niedermayer [Tue, 6 May 2014 22:53:29 +0000 (00:53 +0200)]
ffplay: remove -ec handling code

Its handled by the generic option code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: new idct + asm
plepere [Fri, 13 Jun 2014 11:29:17 +0000 (13:29 +0200)]
avcodec/hevc: new idct + asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '71d6551e674c86d07c165439c2bf6613b3892307'
Michael Niedermayer [Tue, 17 Jun 2014 10:57:56 +0000 (12:57 +0200)]
Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'

* commit '71d6551e674c86d07c165439c2bf6613b3892307':
  avconv: use the correct variable in comparison

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: use the correct variable in comparison
Anton Khirnov [Sat, 14 Jun 2014 19:43:36 +0000 (21:43 +0200)]
avconv: use the correct variable in comparison

6 years agoavcodec/cavsdec: fix low delay decoding
Michael Niedermayer [Tue, 17 Jun 2014 00:30:28 +0000 (02:30 +0200)]
avcodec/cavsdec: fix low delay decoding

Fixes Ticket1095

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/flvdec: Support live flv / NGINX RTMP streams
Michael Niedermayer [Fri, 6 Jun 2014 03:06:12 +0000 (05:06 +0200)]
avformat/flvdec: Support live flv / NGINX RTMP streams

Fixes Ticket3553

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/input: fix harmless integer overflow
Michael Niedermayer [Mon, 16 Jun 2014 20:46:46 +0000 (22:46 +0200)]
swscale/input: fix harmless integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoversion string: add copyright line to version string
Simon Thelen [Tue, 10 Jun 2014 23:58:44 +0000 (01:58 +0200)]
version string: add copyright line to version string

Show the copyright when running `ffmpeg -version'. This is useful for
end users trying to determine whether they are using FFmpeg or Libav.

Signed-off-by: Simon Thelen <ffmpeg@c-14.de>
6 years agoavcodec/bitstream: try to make vlc init code inherently thread safe
Michael Niedermayer [Mon, 16 Jun 2014 17:40:02 +0000 (19:40 +0200)]
avcodec/bitstream: try to make vlc init code inherently thread safe

also remove spinlock, it doesnt work on AIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/bitstream: fill invalid vlc tables entries as last pass instead of first
Michael Niedermayer [Mon, 16 Jun 2014 16:46:14 +0000 (18:46 +0200)]
avcodec/bitstream: fill invalid vlc tables entries as last pass instead of first

This avoids writing entries twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/bitstream: zero vlc tables on allocation
Michael Niedermayer [Mon, 16 Jun 2014 16:45:18 +0000 (18:45 +0200)]
avcodec/bitstream: zero vlc tables on allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoForce aix strip to work on 32 and 64 bit by default.
Carl Eugen Hoyos [Mon, 16 Jun 2014 14:46:10 +0000 (16:46 +0200)]
Force aix strip to work on 32 and 64 bit by default.

6 years agoavcodec/h264: fix frame skip code
Michael Niedermayer [Sat, 7 Jun 2014 18:56:20 +0000 (20:56 +0200)]
avcodec/h264: fix frame skip code

Fixes Ticket3475

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264_slice: support skipping loop filtering for non key frames
Michael Niedermayer [Sat, 7 Jun 2014 18:56:19 +0000 (20:56 +0200)]
avcodec/h264_slice: support skipping loop filtering for non key frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: use the correct level for droping non intra frames
Michael Niedermayer [Sat, 7 Jun 2014 18:56:18 +0000 (20:56 +0200)]
avcodec/h264: use the correct level for droping non intra frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'
Michael Niedermayer [Mon, 16 Jun 2014 11:13:21 +0000 (13:13 +0200)]
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'

* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
  configure: Directly support Android as target OS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'
Michael Niedermayer [Mon, 16 Jun 2014 11:04:36 +0000 (13:04 +0200)]
Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
Michael Niedermayer [Mon, 16 Jun 2014 10:54:36 +0000 (12:54 +0200)]
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'

* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  lavf: dump stream side data when probing

Conflicts:
libavformat/dump.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/dump: put copyright back from the file from which dump.c was split out
Michael Niedermayer [Mon, 16 Jun 2014 10:39:44 +0000 (12:39 +0200)]
avformat/dump: put copyright back from the file from which dump.c was split out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'
Michael Niedermayer [Mon, 16 Jun 2014 10:24:53 +0000 (12:24 +0200)]
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
  lavf: group dump functions together

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'
Michael Niedermayer [Mon, 16 Jun 2014 10:09:15 +0000 (12:09 +0200)]
Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Directly support Android as target OS
Luca Barbato [Fri, 13 Jun 2014 13:14:10 +0000 (15:14 +0200)]
configure: Directly support Android as target OS

6 years agogitignore: add dylib and swp entries
Vittorio Giovara [Mon, 16 Jun 2014 05:31:37 +0000 (01:31 -0400)]
gitignore: add dylib and swp entries

6 years agoAdd nointra AVDiscard level
Michael Niedermayer [Sat, 7 Jun 2014 18:56:17 +0000 (20:56 +0200)]
Add nointra AVDiscard level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 15 Jun 2014 23:38:44 +0000 (01:38 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: reindent.
Ronald S. Bultje [Sun, 15 Jun 2014 22:49:18 +0000 (18:49 -0400)]
swr: reindent.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvdec: Fix fill value for truncated bitstreams
Michael Niedermayer [Sun, 15 Jun 2014 23:06:50 +0000 (01:06 +0200)]
avcodec/huffyuvdec: Fix fill value for truncated bitstreams

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDo not suggest to use gas-preprocessor on aix where it doesn't work.
Carl Eugen Hoyos [Sun, 15 Jun 2014 23:01:40 +0000 (01:01 +0200)]
Do not suggest to use gas-preprocessor on aix where it doesn't work.

6 years agohuffyuvdec: use unsafe bitstream reader
Christophe Gisquet [Sun, 15 Jun 2014 10:04:36 +0000 (12:04 +0200)]
huffyuvdec: use unsafe bitstream reader

The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.

The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohuffyuv: fate: add a BGR24 test
Christophe Gisquet [Sun, 15 Jun 2014 17:33:46 +0000 (19:33 +0200)]
huffyuv: fate: add a BGR24 test

It was previously untested.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: Fix 4K sample video
Kieran [Sat, 14 Jun 2014 18:25:09 +0000 (19:25 +0100)]
hevc: Fix 4K sample video

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