ffmpeg.git
5 years agoMerge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'
Michael Niedermayer [Tue, 9 Dec 2014 23:51:15 +0000 (00:51 +0100)]
Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

* commit '4c81613df499ba81d64ea102b38d0c6686cc304c':
  arm: mlpdsp: handle pic offset calculation in a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'
Michael Niedermayer [Tue, 9 Dec 2014 23:38:52 +0000 (00:38 +0100)]
Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'

* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAllow mov musing if the ac3 parser was disabled.
Carl Eugen Hoyos [Tue, 9 Dec 2014 20:12:54 +0000 (21:12 +0100)]
Allow mov musing if the ac3 parser was disabled.

This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de

5 years agoarm: mlpdsp: handle pic offset calculation in a macro
Janne Grunau [Mon, 8 Dec 2014 13:10:18 +0000 (14:10 +0100)]
arm: mlpdsp: handle pic offset calculation in a macro

Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.

5 years agoarm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent
Janne Grunau [Mon, 8 Dec 2014 12:25:55 +0000 (13:25 +0100)]
arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

No significant difference in used cpu cycles on a cortex-a9.

5 years agoMerge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'
Michael Niedermayer [Tue, 9 Dec 2014 20:04:49 +0000 (21:04 +0100)]
Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'

* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
  libavformat: Build hevc.o when building the RTP muxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/crypto: fix key vs iv typo
Michael Niedermayer [Tue, 9 Dec 2014 18:58:56 +0000 (19:58 +0100)]
avformat/crypto: fix key vs iv typo

Fixes Ticket 4167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: change assert to av_assert0()
Michael Niedermayer [Tue, 9 Dec 2014 16:57:35 +0000 (17:57 +0100)]
avformat/utils: change assert to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: replace impossible condition by av_assert0() in ff_gen_search()
Michael Niedermayer [Tue, 9 Dec 2014 16:53:30 +0000 (17:53 +0100)]
avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavenc: check return value of strftime()
Michael Niedermayer [Tue, 9 Dec 2014 15:10:55 +0000 (16:10 +0100)]
avformat/wavenc: check return value of strftime()

Fixes CID1257006

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat: Build hevc.o when building the RTP muxer
Martin Storsjö [Tue, 9 Dec 2014 10:13:54 +0000 (12:13 +0200)]
libavformat: Build hevc.o when building the RTP muxer

The RTP muxer enables the actual codepaths within sdp.c,
which depend on hevc.o since e5cfc8fd.

This fixes builds with --disable-everything --enable-muxer=rtp.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'
Michael Niedermayer [Tue, 9 Dec 2014 11:08:24 +0000 (12:08 +0100)]
Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'

* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
  aarch64: Use .data.rel.ro for const data with relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'
Michael Niedermayer [Tue, 9 Dec 2014 10:58:13 +0000 (11:58 +0100)]
Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3c01039e0bc7d269900e15551f8171c4328a0223'
Michael Niedermayer [Tue, 9 Dec 2014 10:48:27 +0000 (11:48 +0100)]
Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'

* commit '3c01039e0bc7d269900e15551f8171c4328a0223':
  mov: further expand the list of parsed metadata tags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaarch64: Use .data.rel.ro for const data with relocations
Martin Storsjö [Sun, 16 Nov 2014 10:52:21 +0000 (12:52 +0200)]
aarch64: Use .data.rel.ro for const data with relocations

This reverts commit c00365b46d464ce47716315c1801818d811bdb9a
in addition to using a different section.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Use .data.rel.ro for const data with relocations
Martin Storsjö [Sun, 16 Nov 2014 10:51:54 +0000 (12:51 +0200)]
arm: Use .data.rel.ro for const data with relocations

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat/utils: fix calculating the absolute difference of timestamps
Michael Niedermayer [Tue, 9 Dec 2014 04:31:30 +0000 (05:31 +0100)]
avformat/utils: fix calculating the absolute difference of timestamps

we dont use FFABS(a-b) as that could result in undefined behavior if it overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver_config: reflow add_codec()
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 21:32:22 +0000 (18:32 -0300)]
ffserver_config: reflow add_codec()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: break lines at 80 chars
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 20:25:35 +0000 (17:25 -0300)]
ffserver_config: break lines at 80 chars

Add braces when needed and drop redundant parethesis while at it.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: improve error/warning messages
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 17:12:36 +0000 (14:12 -0300)]
ffserver_config: improve error/warning messages

Fix grammar and quote user-supplied values.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: check strchr() return for NULL
Reynaldo H. Verdejo Pinochet [Mon, 8 Dec 2014 15:42:39 +0000 (12:42 -0300)]
ffserver_config: check strchr() return for NULL

Should fix FFmpeg Coverity Scan issue #1257013

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoavformat/utils: Compute the current pts of mpeg1/2 I/P frames from the next frame...
Michael Niedermayer [Tue, 9 Dec 2014 02:34:20 +0000 (03:34 +0100)]
avformat/utils: Compute the current pts of mpeg1/2 I/P frames from the next frame when available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Pass the next pts/dts to compute_pkt_fields() when available
Michael Niedermayer [Tue, 9 Dec 2014 02:33:44 +0000 (03:33 +0100)]
avformat/utils: Pass the next pts/dts to compute_pkt_fields() when available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use
Michael Niedermayer [Tue, 9 Dec 2014 00:54:51 +0000 (01:54 +0100)]
avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use

Fixes CID1254668

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use use_pkg_config() instead of check_pkg_config() for libsmbclient
Moritz Barsnick [Mon, 8 Dec 2014 15:08:20 +0000 (16:08 +0100)]
configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient

This ensures that the CFLAGS and LDFLAGS are actually applied.
Fixes an incorrect change introduced with the clean-up in commit
cfcaf6b38e39ed6e788abb1a5a44f23660dce2f6.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'
Michael Niedermayer [Mon, 8 Dec 2014 22:01:42 +0000 (23:01 +0100)]
Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'

* commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14':
  mov: expand the list of parsed metadata tags

Conflicts:
libavformat/mov.c

See: 543f3db9784348499a1ac1088373e2fb9100d4c0
See: dadf668df20e041b330fa4d3c5feb32a3f495d32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add libavcodec/options-test
Lukasz Marek [Wed, 3 Dec 2014 23:28:52 +0000 (00:28 +0100)]
fate: add libavcodec/options-test

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavc/options: add test for avcodec_copy_context
Lukasz Marek [Wed, 3 Dec 2014 23:06:40 +0000 (00:06 +0100)]
lavc/options: add test for avcodec_copy_context

This test doesn't cover every possible issue with this function.
It covers options management only.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit 'b704b648f9ecb830874627db958a37e004107d1b'
Michael Niedermayer [Mon, 8 Dec 2014 21:33:38 +0000 (22:33 +0100)]
Merge commit 'b704b648f9ecb830874627db958a37e004107d1b'

* commit 'b704b648f9ecb830874627db958a37e004107d1b':
  mov: parse XMP metadata on demand

Conflicts:
libavformat/isom.h
libavformat/version.h

See: 054c506e3da35471ea92dbedcaaf720d0754f04e

The default is left unchanged at enabled
We can change the default if people prefer but i do not want to do that
in a merge.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '174c5fde90060faab67796a5eaef742630f1db6e'
Michael Niedermayer [Mon, 8 Dec 2014 21:13:23 +0000 (22:13 +0100)]
Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'

* commit '174c5fde90060faab67796a5eaef742630f1db6e':
  mov: parse @PRM and @PRQ metadata tags

Conflicts:
libavformat/mov.c

See: f540851ce320bc69621ea70b89857c54129c82c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'
Michael Niedermayer [Mon, 8 Dec 2014 20:59:08 +0000 (21:59 +0100)]
Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'

* commit '35384934d6e27e0334060a23a0c83a3cb5cef198':
  mov: cosmetics: reorder the list of tags

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6fd91fa11909f27902498648680dbb3d13f1f175'
Michael Niedermayer [Mon, 8 Dec 2014 20:38:07 +0000 (21:38 +0100)]
Merge commit '6fd91fa11909f27902498648680dbb3d13f1f175'

* commit '6fd91fa11909f27902498648680dbb3d13f1f175':
  h264: increase MAX_SLICES to 32

The available sample decodes correctly before, but the reporter of the bug
claims that this change reduces artifacts. This is thus merged
If someone has samples that decode differently depending in the MAX_SLICES
value, please open a ticket on trac.
Also this change should be reverted if it turns out that the artifacts
that where seen had a different cause

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd0b224054f13bf57244694a3ff092cfef68d66f9'
Michael Niedermayer [Mon, 8 Dec 2014 20:04:58 +0000 (21:04 +0100)]
Merge commit 'd0b224054f13bf57244694a3ff092cfef68d66f9'

* commit 'd0b224054f13bf57244694a3ff092cfef68d66f9':
  vf_frei0r: do not increment string if it reached the end

See: 02a6ee51685eb74f7a878dd49553ecc1f8da9fb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '90411b333d6b6bb69d8937117b9250785730dc53'
Michael Niedermayer [Mon, 8 Dec 2014 20:02:42 +0000 (21:02 +0100)]
Merge commit '90411b333d6b6bb69d8937117b9250785730dc53'

* commit '90411b333d6b6bb69d8937117b9250785730dc53':
  Allow reading of growing avi files (currently being written)

Conflicts:
libavformat/avidec.c
tests/ref/fate/cvid-partial

See: e42a3dd123c47efd7921f93d4a1f6f53c196ad4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'
Michael Niedermayer [Mon, 8 Dec 2014 19:53:19 +0000 (20:53 +0100)]
Merge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'

* commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3':
  dpx: always write the image offset

Conflicts:
libavcodec/dpxenc.c
tests/ref/lavf/dpx

See: 361319d0f49475bc14c744194870f9bab78a8a83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '250e077ee9eec0176a6d54a78542dc792943e71a'
Michael Niedermayer [Mon, 8 Dec 2014 19:35:16 +0000 (20:35 +0100)]
Merge commit '250e077ee9eec0176a6d54a78542dc792943e71a'

* commit '250e077ee9eec0176a6d54a78542dc792943e71a':
  riff: Support decoding png in avi (ImageJ)

See: 3668168afa1ef73928b2c6cc2a6ffa8e8ad82312
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: handle 4 more bytes with SIMD for RGB64 in paeth prediction
Michael Niedermayer [Sun, 7 Dec 2014 11:36:10 +0000 (12:36 +0100)]
avcodec/pngdec: handle 4 more bytes with SIMD for RGB64 in paeth prediction

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/pngdsp: fix off by 1 error
Michael Niedermayer [Sun, 7 Dec 2014 11:28:37 +0000 (12:28 +0100)]
avcodec/x86/pngdsp: fix off by 1 error

This fixes artifacts in the last pixel of rows with some widths and pixel formats

Found-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Tested-by: Dominique Leroux <Dominique.Leroux@autodesk.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: Fix AV_OPT_TYPE_BINARY case in av_opt_is_set_to_default()
Michael Niedermayer [Sun, 7 Dec 2014 18:53:18 +0000 (19:53 +0100)]
avutil/opt: Fix AV_OPT_TYPE_BINARY case in av_opt_is_set_to_default()

Fixes CID1257010

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: further expand the list of parsed metadata tags
Dave Rice [Fri, 28 Nov 2014 23:44:06 +0000 (23:44 +0000)]
mov: further expand the list of parsed metadata tags

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agomov: expand the list of parsed metadata tags
Vittorio Giovara [Fri, 28 Nov 2014 23:25:20 +0000 (23:25 +0000)]
mov: expand the list of parsed metadata tags

Based on L-Smash code by Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>.

5 years agoavcodec/ppc/vp3dsp_altivec: POWER LE support to vp3_idct_add_altivec()
Rong Yan [Mon, 8 Dec 2014 08:00:59 +0000 (08:00 +0000)]
avcodec/ppc/vp3dsp_altivec: POWER LE support to vp3_idct_add_altivec()

add GET_VDST16() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: parse XMP metadata on demand
Vittorio Giovara [Wed, 3 Dec 2014 02:43:24 +0000 (02:43 +0000)]
mov: parse XMP metadata on demand

The Extensible Metadata Platform tag can contain various kind of data
which are not strictly related to the video file, such as history of edits
and saves from the project file. So display XMP metadata only when the
user explicitly requires it.

Based on a patch by Marek Fort <marek.fort@chyronhego.com>.

5 years agomov: parse @PRM and @PRQ metadata tags
Vittorio Giovara [Wed, 3 Dec 2014 02:42:29 +0000 (02:42 +0000)]
mov: parse @PRM and @PRQ metadata tags

These tags describe the product and quicktime library version respectively.
They originate from Adobe Premiere, but also some other programs use them.
Contrary to other tags, they contain 'raw' data which is not to be
interpreted as iso639 or mac strings.

Based on a patch by Peter Ross <pross@xvid.org>.

5 years agomov: cosmetics: reorder the list of tags
Vittorio Giovara [Wed, 3 Dec 2014 02:41:43 +0000 (02:41 +0000)]
mov: cosmetics: reorder the list of tags

Alphabetically order the list by the tag to facilitate the insertion of
new ones.

5 years agoh264: increase MAX_SLICES to 32
Vittorio Giovara [Fri, 5 Dec 2014 03:46:13 +0000 (03:46 +0000)]
h264: increase MAX_SLICES to 32

H264 streams from CounterPath Bria and some Cisco phones need an
increased pool for correct decoding.

Bug-Id: 645
Sample-Id: bria-h264.mka

5 years agovf_frei0r: do not increment string if it reached the end
Vittorio Giovara [Fri, 5 Dec 2014 02:15:09 +0000 (02:15 +0000)]
vf_frei0r: do not increment string if it reached the end

Bug-Id: 778
CC: libav-stable@libav.org
5 years agoAllow reading of growing avi files (currently being written)
Joakim Plate [Fri, 5 Dec 2014 03:06:50 +0000 (03:06 +0000)]
Allow reading of growing avi files (currently being written)

This uses the RIFF header stored size to figure out the expected AVI
file size, instead of the actual file. To work fully it requires handling
failed avio_seek() instead of assuming they always succeed.

Some fate file has been cut off and contains half a frame at the end which
previously was not output during demuxing. This frame is now output to
encoder, thus the fate diff update.

Bug-Id: 261
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agodpx: always write the image offset
Zoltan Kovacs [Fri, 5 Dec 2014 02:42:10 +0000 (02:42 +0000)]
dpx: always write the image offset

According to the DPX file format description found at
http://www.fileformat.info/format/dpx/egff.htm the ImageElement part of
the GenericImageHeader also contains an an offset to the real image data
beside the same member that can be found in the GenericFileHeader.

Libav keeps this member empty (=0) while some applications expects it to
be filled properly. FATE test updated accordingly.

Bug-Id: 742
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoriff: Support decoding png in avi (ImageJ)
Carl Eugen Hoyos [Thu, 4 Dec 2014 19:13:19 +0000 (19:13 +0000)]
riff: Support decoding png in avi (ImageJ)

5 years agoMerge commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0'
Michael Niedermayer [Mon, 8 Dec 2014 11:31:54 +0000 (12:31 +0100)]
Merge commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0'

* commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0':
  arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54'
Michael Niedermayer [Mon, 8 Dec 2014 11:24:43 +0000 (12:24 +0100)]
Merge commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54'

* commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54':
  arm: fft_vfp: Add a missing "endconst" when building in thumb mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b'
Michael Niedermayer [Mon, 8 Dec 2014 11:14:47 +0000 (12:14 +0100)]
Merge commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b'

* commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b':
  rtpproto: Write a warning if the input data written isn't RTP packetized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb
Martin Storsjö [Sun, 16 Nov 2014 10:46:51 +0000 (12:46 +0200)]
arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb

Don't include the function pointer table in the code segment
in arm mode.

This shouldn't have any significant performance effect. It does
end up as a few more instructions than before, for ARM, but
only at the entry to this function, not within the fft functions
themselves.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: fft_vfp: Add a missing "endconst" when building in thumb mode
Martin Storsjö [Sun, 16 Nov 2014 10:38:53 +0000 (12:38 +0200)]
arm: fft_vfp: Add a missing "endconst" when building in thumb mode

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpproto: Write a warning if the input data written isn't RTP packetized
Martin Storsjö [Sat, 6 Dec 2014 23:42:06 +0000 (01:42 +0200)]
rtpproto: Write a warning if the input data written isn't RTP packetized

Tell the user that the RTP muxer needs to be used to packetize
the data - using the RTP protocol on its own isn't enough.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoconfigure: Let the libx264rgb encoder select the libx264 encoder.
Carl Eugen Hoyos [Mon, 8 Dec 2014 09:43:12 +0000 (10:43 +0100)]
configure: Let the libx264rgb encoder select the libx264 encoder.

Standalone compilation of the libx264rgb encoder does not work.

5 years agoavcodec/pngdec: check av_image_get_linesize return value
Benoit Fouet [Mon, 8 Dec 2014 02:16:46 +0000 (03:16 +0100)]
avcodec/pngdec: check av_image_get_linesize return value

Fixes CID 1257012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: Add 2048x1080 to the aivx case
Rens Dijkshoorn [Sat, 6 Dec 2014 01:20:38 +0000 (02:20 +0100)]
avformat/movenc: Add 2048x1080 to the aivx case

This improves compatibility of such files with apple tools

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a880090cd75b6c31b5ee1f088b6578a293099c6'
Michael Niedermayer [Mon, 8 Dec 2014 01:19:19 +0000 (02:19 +0100)]
Merge commit '6a880090cd75b6c31b5ee1f088b6578a293099c6'

* commit '6a880090cd75b6c31b5ee1f088b6578a293099c6':
  doc: Use the correct @subsection tag

See: cf3bfc970c7a567763aef4bf7ce827f84d692fd6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4fd7e63c87226584e60200b82630a6057c0a6663'
Michael Niedermayer [Mon, 8 Dec 2014 01:03:30 +0000 (02:03 +0100)]
Merge commit '4fd7e63c87226584e60200b82630a6057c0a6663'

* commit '4fd7e63c87226584e60200b82630a6057c0a6663':
  mp3: Tweak the probe scores

Conflicts:
libavformat/mp3dec.c

FFmpeg detects the file fine, and there is a non zero risk
that this change may lead to misdetections, thus not merged.
If someone has a mp3 file that is misdetected, please open a ticket

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'
Michael Niedermayer [Mon, 8 Dec 2014 00:39:43 +0000 (01:39 +0100)]
Merge commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'

* commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2':
  latm: Do not give a score for a single instance

Conflicts:
libavformat/rawdec.c

No change, the buggy case was not part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'
Michael Niedermayer [Mon, 8 Dec 2014 00:34:28 +0000 (01:34 +0100)]
Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'

* commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06':
  lavfi: Increase drawtext font size limits

Conflicts:
libavfilter/vf_drawtext.c

See: b87d4c2b9f4106045afeabe1f1338c3eddb66935
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoImprove configure help text.
Carl Eugen Hoyos [Sun, 7 Dec 2014 23:33:21 +0000 (00:33 +0100)]
Improve configure help text.

Show which features external libraries enable.
Fixes ticket #4157

5 years agoFix xcb 32bit pix_fmts: There is no screen transparency.
Carl Eugen Hoyos [Sun, 7 Dec 2014 23:31:01 +0000 (00:31 +0100)]
Fix xcb 32bit pix_fmts: There is no screen transparency.

5 years agoavformat/matroskadec: request a sample with recursive seek heads
Michael Niedermayer [Sun, 7 Dec 2014 21:45:34 +0000 (22:45 +0100)]
avformat/matroskadec: request a sample with recursive seek heads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: fix handling of recursive SeekHead elements
wm4 [Sat, 6 Dec 2014 15:53:30 +0000 (16:53 +0100)]
avformat/matroskadec: fix handling of recursive SeekHead elements

When matroska_execute_seekhead() is called, it goes through the list of
seekhead entries and attempts to read elements not read yet. When doing
this, the parser can find further SeekHead elements, and will extend the
matroska->seekhead list. This can lead to a (practically) infinite loop
with certain broken files. (Maybe it can happen even with valid files.
The demuxer doesn't seem to check correctly whether an element has
already been read.)

Fix this by ignoring elements that were added to the seekhead field
during executing seekhead entries.

This does not fix the possible situation when multiple SeekHead elements
after the file header (i.e. occur after the "before_pos" file position)
point to the same elements. These elements will probably be parsed
multiple times, likely leading to bugs.

Fixes ticket #4162.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Use the correct @subsection tag
Luca Barbato [Sun, 7 Dec 2014 17:38:56 +0000 (18:38 +0100)]
doc: Use the correct @subsection tag

makeinfo would otherwise refuse to build it.

5 years agomp3: Tweak the probe scores
Luca Barbato [Sat, 6 Dec 2014 11:32:25 +0000 (12:32 +0100)]
mp3: Tweak the probe scores

Having more than 10 consecutive frames decoded as mp3 should be
considered a clear signal that the sample is mp3 and not mpegps.

Reported-By: Florian Iragne <florian@iragne.fr>
CC: libav-stable@libav.org
5 years agodoc/filters: Add ascii graphics to clarify what the currently implemented tinterlace...
Michael Niedermayer [Tue, 2 Dec 2014 15:32:25 +0000 (16:32 +0100)]
doc/filters: Add ascii graphics to clarify what the currently implemented tinterlace modes do

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dashenc: make durations 64bit
Michael Niedermayer [Sat, 6 Dec 2014 16:46:02 +0000 (17:46 +0100)]
avformat/dashenc: make durations 64bit

Fix potential integer overflow
Fix CID1254944

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Check AVFrame width/height in avcodec_encode_video2()
Michael Niedermayer [Sun, 7 Dec 2014 16:23:54 +0000 (17:23 +0100)]
avcodec/utils: Check AVFrame width/height in avcodec_encode_video2()

This is similar to the format check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/xcbgrab: Fix show_region rectangle
Daniel Moran [Sat, 6 Dec 2014 23:48:13 +0000 (23:48 +0000)]
avdevice/xcbgrab: Fix show_region rectangle

Fixes trac ticket #4164

This is to address an error when using show_region, which would cause part of the captured area to become static.
It looks like the rectangle specifying the capture area was relative to the capture window.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jacosubdec: check strftime return value
Clément Bœsch [Sun, 7 Dec 2014 14:46:17 +0000 (15:46 +0100)]
avcodec/jacosubdec: check strftime return value

Fixes CID1257004

5 years agolatm: Do not give a score for a single instance
Luca Barbato [Fri, 5 Dec 2014 14:31:20 +0000 (15:31 +0100)]
latm: Do not give a score for a single instance

Bug-Id: 773
CC: libav-stable@libav.org
5 years agolavfi: Increase drawtext font size limits
Михаил Муковников [Tue, 2 Dec 2014 14:09:30 +0000 (17:09 +0300)]
lavfi: Increase drawtext font size limits

Raise the maximum font size to a larger value.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavutil/opt: Check av_parse_video_rate()s return value
Michael Niedermayer [Sun, 7 Dec 2014 01:57:39 +0000 (02:57 +0100)]
avutil/opt: Check av_parse_video_rate()s return value

Fixes CID1257008

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: Check av_parse_color() return value
Michael Niedermayer [Sun, 7 Dec 2014 01:46:25 +0000 (02:46 +0100)]
avutil/opt: Check av_parse_color() return value

Fixes: CID1257007

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: check AVframe.format being set in avcodec_encode_video2()
Michael Niedermayer [Sun, 7 Dec 2014 01:10:19 +0000 (02:10 +0100)]
avcodec/utils: check AVframe.format being set in avcodec_encode_video2()

We dont fail hard if its not set as the old API allowed this and our examples
did in the distant past not set it, these examples still work with the
current code and some encoders.

Based on suggestion by: funman
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: add commented out av_log() to probe
Michael Niedermayer [Sat, 6 Dec 2014 21:38:38 +0000 (22:38 +0100)]
avformat/mpeg: add commented out av_log() to probe

This is commonly needed for debugging mis-detections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: do not count PES packets inside PES packets during probing
Michael Niedermayer [Sat, 6 Dec 2014 21:33:09 +0000 (22:33 +0100)]
avformat/mpeg: do not count PES packets inside PES packets during probing

Fixes: misdetection of test2.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync...
Michael Niedermayer [Sat, 6 Dec 2014 19:24:27 +0000 (20:24 +0100)]
avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake

Fixes CID1257011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Warn if ffio_ensure_seekback() failed
Michael Niedermayer [Sat, 6 Dec 2014 19:08:08 +0000 (20:08 +0100)]
avformat/mpegts: Warn if ffio_ensure_seekback() failed

Should silence CID1257005

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxavs: disable global header code
Michael Niedermayer [Sat, 6 Dec 2014 17:55:50 +0000 (18:55 +0100)]
avcodec/libxavs: disable global header code

This code only segfaults and fixing the segfault, the resulting
files are unplayable, so disable to avoid the segfault.

Better solution is welcome

See: [FFmpeg-devel] [PATCH] avcodec/libxavs: remove global header code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/apetag: More completely check avio_get_str() return value
Michael Niedermayer [Sat, 6 Dec 2014 16:12:49 +0000 (17:12 +0100)]
avformat/apetag: More completely check avio_get_str() return value

This is not needed but its more proper to check the return value

Fixes CID1041122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_signalstats: fix avframe leak on error
Michael Niedermayer [Sat, 6 Dec 2014 15:57:23 +0000 (16:57 +0100)]
avfilter/vf_signalstats: fix avframe leak on error

Fixes CID1257014
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/buffersrc: add context to av_log() call
Michael Niedermayer [Sat, 6 Dec 2014 14:31:05 +0000 (15:31 +0100)]
avfilter/buffersrc: add context to av_log() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: Add context to av_log() call
Michael Niedermayer [Sat, 6 Dec 2014 14:30:41 +0000 (15:30 +0100)]
avcodec/hevc_ps: Add context to av_log() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avcodec: use NULL instead of 0 for pointer
Michael Niedermayer [Sat, 6 Dec 2014 14:29:23 +0000 (15:29 +0100)]
avfilter/avcodec: use NULL instead of 0 for pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver_config: fix line width on fwd declarations
Reynaldo H. Verdejo Pinochet [Sat, 6 Dec 2014 05:21:56 +0000 (02:21 -0300)]
ffserver_config: fix line width on fwd declarations

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: reflow _get_arg()
Reynaldo H. Verdejo Pinochet [Sat, 6 Dec 2014 05:14:20 +0000 (02:14 -0300)]
ffserver_config: reflow _get_arg()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: reflow _parse_ffconfig()
Reynaldo H. Verdejo Pinochet [Fri, 5 Dec 2014 23:38:30 +0000 (20:38 -0300)]
ffserver_config: reflow _parse_ffconfig()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agodoc: html: Use native viewport
Timothy Gu [Thu, 4 Dec 2014 05:31:35 +0000 (21:31 -0800)]
doc: html: Use native viewport

Fixes displaying docs on small-screen devices.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Do not use the headings as links to TOC anchors
Timothy Gu [Thu, 4 Dec 2014 05:31:34 +0000 (21:31 -0800)]
doc: Do not use the headings as links to TOC anchors

Instead, use FontAwesome icons (if configured to be this way) or separate
text.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: added segment filename option
Christian Suloway [Fri, 5 Dec 2014 21:20:15 +0000 (21:20 +0000)]
avformat/hlsenc: added segment filename option

This option allows segment filenames to be specified. Unless -hls_flags
single_file is set the filename is used as a string format with the
segment number.

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename
bar%03d.ts foo.m3u8

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: Remove redundant "DVBSub error" prefix
Michael Niedermayer [Sat, 6 Dec 2014 01:03:08 +0000 (02:03 +0100)]
avcodec/dvbsubdec: Remove redundant "DVBSub error" prefix

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'
Michael Niedermayer [Sat, 6 Dec 2014 00:46:39 +0000 (01:46 +0100)]
Merge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'

* commit '9a738c27dceb4b975784b23213a46f5cb560d1c2':
  v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Conflicts:
libavcodec/v210enc.c
libavcodec/v210enc.h
libavcodec/x86/Makefile
libavcodec/x86/v210enc.asm
libavcodec/x86/v210enc_init.c
tests/ref/vsynth/vsynth1-v210
tests/ref/vsynth/vsynth2-v210

See: 36091742d182b3ad4411aae22682354b3834a974
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'
Michael Niedermayer [Sat, 6 Dec 2014 00:29:53 +0000 (01:29 +0100)]
Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'

* commit '33c827f632f95ffe3399b695a5a0d47b366b6e20':
  swscale: Properly scale YUV

Conflicts:
libswscale/swscale_unscaled.c
tests/ref/fate/filter-pixdesc-yuv420p10be
tests/ref/fate/filter-pixdesc-yuv420p10le
tests/ref/fate/filter-pixdesc-yuv420p9be
tests/ref/fate/filter-pixdesc-yuv420p9le
tests/ref/fate/filter-pixdesc-yuva420p10be
tests/ref/fate/filter-pixdesc-yuva420p10le
tests/ref/fate/filter-pixdesc-yuva420p9be
tests/ref/fate/filter-pixdesc-yuva420p9le
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip

See: abe0b8e9f378a0f8781c1a3da6714d20cfd19594
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'
Michael Niedermayer [Sat, 6 Dec 2014 00:01:06 +0000 (01:01 +0100)]
Merge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'

* commit '8c0a865ad96b9e8542051f75b0edc424cb73994e':
  mov: skip version and flags attributes in mov_read_chan()

See: 59d40fc7e66e6ebb2d89e25115492bfe13b07d95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/options: fix leaks in avcodec_copy_context
Lukasz Marek [Wed, 26 Nov 2014 23:41:16 +0000 (00:41 +0100)]
lavc/options: fix leaks in avcodec_copy_context

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>