ffmpeg.git
4 years agoUpdate Changelog for 2.5.1 n2.5.1
Michael Niedermayer [Mon, 15 Dec 2014 22:52:03 +0000 (23:52 +0100)]
Update Changelog for 2.5.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUpdate for FFmpeg 2.5.1
Michael Niedermayer [Mon, 15 Dec 2014 14:30:31 +0000 (15:30 +0100)]
Update for FFmpeg 2.5.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavu/frame: fix malloc error path in av_frame_copy_props()
wm4 [Mon, 15 Dec 2014 03:32:58 +0000 (04:32 +0100)]
lavu/frame: fix malloc error path in av_frame_copy_props()

The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a400edbb6d00c0211de38e4f1b4f593681db91d8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Do not update programs streams from program-less streams in update_wr...
Michael Niedermayer [Sun, 14 Dec 2014 18:46:31 +0000 (19:46 +0100)]
avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()

Fixes Ticket3686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Check that avio_seek() target is non negative
Michael Niedermayer [Sun, 14 Dec 2014 16:26:11 +0000 (17:26 +0100)]
avformat/aviobuf: Check that avio_seek() target is non negative

Fixes out of array access

Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ed86dbd05d61363dc1c0d33f3267e2177c985fdd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/soxr_resample: fix error handling
Rob Sykes [Sat, 13 Dec 2014 20:12:56 +0000 (21:12 +0100)]
swresample/soxr_resample: fix error handling

Fixes CID1257659

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4b6f2253741f3023928e61ae5105ccd4b1c515fb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: fix potential use of uninitialized variables
Michael Niedermayer [Wed, 10 Dec 2014 12:30:51 +0000 (13:30 +0100)]
avformat/flvdec: fix potential use of uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0fadbd3623cf9132832f48810c0edb93aa63f51b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 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>
(cherry picked from commit 2d0117f816b92510546caf26414961ee6088f961)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 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>
(cherry picked from commit 754f4957d7a7e5be0df0e9de1d31aebeecdc4476)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 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>
(cherry picked from commit 9bd8f2cc32c2616c2bc010dd50f542ce6a85162b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 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>
(cherry picked from commit 6551acab6877addae815decd02aeca33ba4990c8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples/filtering_video: fix frame rate
Piotr Fusik [Fri, 5 Dec 2014 14:47:05 +0000 (15:47 +0100)]
doc/examples/filtering_video: fix frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c99e5191ab846d4897dfc565ba446ec960e04aa9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegaudiodec_template: only allocate fdsp when its used
Michael Niedermayer [Fri, 5 Dec 2014 03:27:49 +0000 (04:27 +0100)]
avcodec/mpegaudiodec_template: only allocate fdsp when its used

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a7ebd0b011f9576c843a86bd6a1828ecaa6faf3a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples/transcoding: check encoder before using it
Michael Niedermayer [Thu, 4 Dec 2014 17:58:38 +0000 (18:58 +0100)]
doc/examples/transcoding: check encoder before using it

Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bde27e1e617dfeb3c026f530f48a77f5ed8aa2ea)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add 2.5
Michael Niedermayer [Thu, 4 Dec 2014 13:24:59 +0000 (14:24 +0100)]
MAINTAINERS: add 2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4f21a8dd9d8b327334d706a96c0cb5c41bd82b6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_...
Rong Yan [Thu, 4 Dec 2014 10:34:02 +0000 (10:34 +0000)]
avcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_epel_v_altivec_core() put_vp8_pixels16_altivec() add marcos GET_PIXHL() GET_OUTER() LOAD_HL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d23e8832486f0a37c7ad708b504b723bcfa2f71d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()
Rong Yan [Thu, 4 Dec 2014 05:51:30 +0000 (05:51 +0000)]
avcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 36cd2bcbc343c299241dc7275cb85cbc3fc6b8ad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUpdate RELEASE_NOTES
Timothy Gu [Thu, 4 Dec 2014 04:10:33 +0000 (20:10 -0800)]
Update RELEASE_NOTES

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangelog/RELEASE_NOTES: Add APNG decoder
Timothy Gu [Thu, 4 Dec 2014 05:06:07 +0000 (06:06 +0100)]
Changelog/RELEASE_NOTES: Add APNG decoder

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
4 years agoChangelog: release is 2.5 not "next" n2.5
Michael Niedermayer [Thu, 4 Dec 2014 01:16:20 +0000 (02:16 +0100)]
Changelog: release is 2.5 not "next"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aacdec: reduce noisiness of missing channel elements
Michael Niedermayer [Thu, 4 Dec 2014 00:47:55 +0000 (01:47 +0100)]
avcodec/aacdec: reduce noisiness of missing channel elements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5fe026f2bda68a129d70b9609c4902917db9ca2e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix standalone compilation of the iec61883 input device.
Carl Eugen Hoyos [Thu, 4 Dec 2014 00:35:47 +0000 (01:35 +0100)]
Fix standalone compilation of the iec61883 input device.
(cherry picked from commit 963aa1daf88066d43c7495803b870800c5faaa4d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUpdate for 2.5
Michael Niedermayer [Wed, 3 Dec 2014 23:47:17 +0000 (00:47 +0100)]
Update for 2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pngdec: fix indentation in handle_row()
Benoit Fouet [Wed, 3 Dec 2014 13:16:57 +0000 (14:16 +0100)]
avcodec/pngdec: fix indentation in handle_row()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pngdec: fix mem leak in init()
Benoit Fouet [Wed, 3 Dec 2014 13:16:56 +0000 (14:16 +0100)]
avcodec/pngdec: fix mem leak in init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/pngdec: support 'previous' dispose operation for APNG.
Benoit Fouet [Wed, 3 Dec 2014 13:16:55 +0000 (14:16 +0100)]
libavcodec/pngdec: support 'previous' dispose operation for APNG.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264_i386: Fix operand size
Reimar Döffinger [Wed, 3 Dec 2014 21:39:00 +0000 (22:39 +0100)]
h264_i386: Fix operand size

Fixes fate failure on macosx clang x86-64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRELEASE_NOTES: update for 2.5
Michael Niedermayer [Wed, 3 Dec 2014 20:55:34 +0000 (21:55 +0100)]
RELEASE_NOTES: update for 2.5

If you spot something missing wrong or improvable, do not hesitate
to push fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: fill in hashes and dates
Michael Niedermayer [Wed, 3 Dec 2014 20:51:28 +0000 (21:51 +0100)]
doc/APIchanges: fill in hashes and dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangelog: Add libpostproc visualization
Michael Niedermayer [Wed, 3 Dec 2014 20:42:03 +0000 (21:42 +0100)]
Changelog: Add libpostproc visualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/oggenc: use meaningful error codes
Lukasz Marek [Tue, 2 Dec 2014 23:35:51 +0000 (00:35 +0100)]
lavf/oggenc: use meaningful error codes

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoswscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Michael Niedermayer [Wed, 3 Dec 2014 19:21:56 +0000 (20:21 +0100)]
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rmdec: Check codec_data_size
Michael Niedermayer [Wed, 3 Dec 2014 19:01:18 +0000 (20:01 +0100)]
avformat/rmdec: Check codec_data_size

Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Fix infinite loop in ff_get_line()
Michael Niedermayer [Wed, 3 Dec 2014 18:05:56 +0000 (19:05 +0100)]
avformat/aviobuf: Fix infinite loop in ff_get_line()

Fixes ticket4152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/decklink_common: fix COM initialization failure check
Jonathan Baecker [Wed, 3 Dec 2014 15:41:41 +0000 (16:41 +0100)]
avdevice/decklink_common: fix COM initialization failure check

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:46:33 +0000 (14:46 +0100)]
avcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:43:40 +0000 (14:43 +0100)]
avcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:39:43 +0000 (14:39 +0100)]
avcodec/opusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopngdsp x86: use unaligned access
Christophe Gisquet [Tue, 2 Dec 2014 13:31:49 +0000 (14:31 +0100)]
pngdsp x86: use unaligned access

For test images manually generated to contain only up prediction,
timing results:
         8380x3032    255x185
before:   138635       1992
after:    139232       1996

Actually jumping to the proper version depending on the alignment:
8380x3032: 138767

A 0.5% speed improvement for gigantic images is not worth the code
duplication.

Fixes ticket #4148

Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Tested-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: drop usage of coded_frame
Michael Niedermayer [Wed, 3 Dec 2014 02:06:43 +0000 (03:06 +0100)]
ffmpeg: drop usage of coded_frame

It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/decklink_common: fix heap corruption run time error
Jonathan Baecker [Tue, 2 Dec 2014 19:10:41 +0000 (20:10 +0100)]
avdevice/decklink_common: fix heap corruption run time error

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoSupport muxing 4k AVC Intra in mov.
Carl Eugen Hoyos [Tue, 2 Dec 2014 22:35:40 +0000 (23:35 +0100)]
Support muxing 4k AVC Intra in mov.

Reported and tested by Rens Dijkshoorn, rens onlinemedia nl

4 years agoMerge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'
Michael Niedermayer [Tue, 2 Dec 2014 21:55:14 +0000 (22:55 +0100)]
Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'

* commit '2e0935965b824bc641b7e0bafafcbb1e36027f79':
  Drop the unofficial extension prefix for MPEG and MPEG-TS formats

See: fdcb2873e1c898cf26216f7e80d95d03387ba55b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
Michael Niedermayer [Tue, 2 Dec 2014 21:53:22 +0000 (22:53 +0100)]
Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'

* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
libavformat/mpegtsenc.c

See: e2baaa21aabc7edb3c2275eac39ed1d40884b25a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
Michael Niedermayer [Tue, 2 Dec 2014 21:39:01 +0000 (22:39 +0100)]
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'

* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
libavformat/mpegtsenc.c

See: 09a858da7d5535e78e9cf942a468aec411ffbf19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '26e20dfd06ac62da596a9549867f990f1200a04e'
Michael Niedermayer [Tue, 2 Dec 2014 21:34:06 +0000 (22:34 +0100)]
Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'

* commit '26e20dfd06ac62da596a9549867f990f1200a04e':
  options_table: fix colorspace minimum option value

See: 8c28a39c2c38fd9d13dc5247fca7bca8b3f2fcad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'
Michael Niedermayer [Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)]
Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'

* commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09':
  mov: allocate the tag value dynamically

Conflicts:
libavformat/mov.c

See: f31445a82d6acd0b8fab5a26c04e91645f4854d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'
Michael Niedermayer [Tue, 2 Dec 2014 21:00:02 +0000 (22:00 +0100)]
Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'

* commit 'e352b293712ff7cbde67eba3ce3f8510b037de09':
  mov: Add an option for exporting all metadata

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver_config: print warning when using default value
Lukasz Marek [Wed, 26 Nov 2014 18:41:24 +0000 (19:41 +0100)]
ffserver_config: print warning when using default value

Some of the defaults may be harmful (like buffer size).
It is good user is aware of that.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoffserver_config: set defaults basing on absence of set value
Lukasz Marek [Wed, 26 Nov 2014 18:08:18 +0000 (19:08 +0100)]
ffserver_config: set defaults basing on absence of set value

This prevents the situation when user set option to 0 and ffserver
threats it as not set value, so applies the default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoffserver_config: remove useless defaults
Lukasz Marek [Wed, 26 Nov 2014 17:54:16 +0000 (18:54 +0100)]
ffserver_config: remove useless defaults

Options are already set to its defaults by AVOption API.
The only difference is for qmin, new default is 2, ffserver set to 3.
It is dead code because if condition is not meet unless user set option to 0.
Meeting condition would mean that ffserver overwrites explicity set option.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoffserver: use avcodec_copy_context to copy context
Lukasz Marek [Sat, 22 Nov 2014 01:33:29 +0000 (02:33 +0100)]
ffserver: use avcodec_copy_context to copy context

Copying context using dedicated function is safer that raw memcpy
which creates shallow copy.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoMerge commit '5639ed9abb58311f82cf3499b682d228290adb09'
Michael Niedermayer [Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)]
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'

* commit '5639ed9abb58311f82cf3499b682d228290adb09':
  mov: do not truncate the language-prefixed tag

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'
Michael Niedermayer [Tue, 2 Dec 2014 20:39:05 +0000 (21:39 +0100)]
Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'

* commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3':
  rtsp: move the CONFIG_ macros to the beginning of the check

Conflicts:
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
Michael Niedermayer [Tue, 2 Dec 2014 20:29:48 +0000 (21:29 +0100)]
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'

* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
  aac: Simplify decode_mid_side_stereo

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 2 Dec 2014 18:48:01 +0000 (19:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  configure: add a note about pkg-config --static.
  configure: add optional pkg-config helper and use it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aacdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Tue, 2 Dec 2014 18:16:02 +0000 (19:16 +0100)]
avcodec/aacdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avfilter/vf_interlace: more accurate pts calculation"
Michael Niedermayer [Tue, 2 Dec 2014 17:48:03 +0000 (18:48 +0100)]
Revert "avfilter/vf_interlace: more accurate pts calculation"

This reverts commit df8248f66e362c3015d95ac86d1917dde8dc0a0c.

the revert produces a timebase and timestamps that are more close
to what users expect

Hoped-by: koda
4 years agoconfigure: add a note about pkg-config --static.
Nicolas George [Tue, 2 Dec 2014 12:54:46 +0000 (13:54 +0100)]
configure: add a note about pkg-config --static.

Try to detect "$cc -static" without "pkg-config --static".
Also, when a library detection using pkg-config fails,
make it explicit this was pkg-config.

4 years agoconfigure: add optional pkg-config helper and use it.
Nicolas George [Tue, 2 Dec 2014 12:29:47 +0000 (13:29 +0100)]
configure: add optional pkg-config helper and use it.

The require variant dies if the package is not present.
The check variant does not import the flags to the used list.
The new variant imports the flags if the package is present
but does not die if it is not.
The new call graph is: require -> use -> check.

Use use_pkg_config for libx264 and libsmbclient: more readable
and three external call less per library.

4 years agoavfilter/vf_tinterlace: Favor using standard timebases for the output
Michael Niedermayer [Mon, 1 Dec 2014 19:52:10 +0000 (20:52 +0100)]
avfilter/vf_tinterlace: Favor using standard timebases for the output

Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_in...
Rong Yan [Tue, 2 Dec 2014 07:37:11 +0000 (07:37 +0000)]
avcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_int16_altivec()

adds macro GET_T()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoDrop the unofficial extension prefix for MPEG and MPEG-TS formats
Florent Le Coz [Sat, 29 Nov 2014 16:53:47 +0000 (17:53 +0100)]
Drop the unofficial extension prefix for MPEG and MPEG-TS formats

As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003

CC: libav-stable@libav.org
4 years agompegtsenc: recognize .mts as MPEG Transport Stream
Jean-Baptiste Mardelle [Sat, 29 Nov 2014 16:53:46 +0000 (17:53 +0100)]
mpegtsenc: recognize .mts as MPEG Transport Stream

4 years agoAdd support for BDAV/m2ts-mode muxing
Fredrik Axelsson [Sat, 29 Nov 2014 16:53:45 +0000 (17:53 +0100)]
Add support for BDAV/m2ts-mode muxing

Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agooptions_table: fix colorspace minimum option value
Jon Morley [Mon, 10 Nov 2014 18:43:42 +0000 (10:43 -0800)]
options_table: fix colorspace minimum option value

The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.

4 years agomov: allocate the tag value dynamically
Thilo Borgmann [Sat, 29 Nov 2014 16:51:14 +0000 (17:51 +0100)]
mov: allocate the tag value dynamically

This allows to load metadata entries longer than 1024 bytes.
Displaying them is still limited to 1024 characters, but applications
can load them fully now.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agomov: Add an option for exporting all metadata
Vittorio Giovara [Sat, 29 Nov 2014 16:51:13 +0000 (17:51 +0100)]
mov: Add an option for exporting all metadata

4 years agomov: do not truncate the language-prefixed tag
Vittorio Giovara [Sat, 29 Nov 2014 16:51:12 +0000 (17:51 +0100)]
mov: do not truncate the language-prefixed tag

4 years agortsp: move the CONFIG_ macros to the beginning of the check
Vittorio Giovara [Sat, 29 Nov 2014 16:39:41 +0000 (17:39 +0100)]
rtsp: move the CONFIG_ macros to the beginning of the check

With --disable-optimizations, the DCE of some compilers does not remove
such unused code, causing linking failure.

4 years agoaac: Simplify decode_mid_side_stereo
Luca Barbato [Fri, 21 Nov 2014 12:57:36 +0000 (12:57 +0000)]
aac: Simplify decode_mid_side_stereo

Might spare few cycles if the compiler is naive and
makes the function more readable.

4 years agoavformat/apngdec: exit probing when skipping is not possible.
Benoit Fouet [Tue, 2 Dec 2014 10:24:21 +0000 (11:24 +0100)]
avformat/apngdec: exit probing when skipping is not possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoapng: move shared header from avformat to avcodec.
Benoit Fouet [Tue, 2 Dec 2014 08:21:47 +0000 (09:21 +0100)]
apng: move shared header from avformat to avcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/qcp: Print unknown GUID on error.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:40:01 +0000 (11:40 +0100)]
lavf/qcp: Print unknown GUID on error.

4 years agoAlso print GUIDs as shown in the Windows registry to ease debugging.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:39:06 +0000 (11:39 +0100)]
Also print GUIDs as shown in the Windows registry to ease debugging.

4 years agolavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:36:48 +0000 (11:36 +0100)]
lavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.

Fixes ticket #3544.

4 years agotests: Add vsynth2 which uses the new reference.pnm
Michael Niedermayer [Sun, 30 Nov 2014 18:28:42 +0000 (19:28 +0100)]
tests: Add vsynth2 which uses the new reference.pnm

The file is already present in git and by using it we can perform more tests
without the need of fate samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests: Rename vsynth2 to vsynth_lena
Michael Niedermayer [Sun, 30 Nov 2014 18:47:45 +0000 (19:47 +0100)]
tests: Rename vsynth2 to vsynth_lena

This avoids confusion with a growing number of vsynth tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/crypto: Use av_memdup()
Michael Niedermayer [Tue, 2 Dec 2014 00:47:49 +0000 (01:47 +0100)]
avformat/crypto: Use av_memdup()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/crypto: added encryption
Christian Suloway [Mon, 1 Dec 2014 18:55:28 +0000 (12:55 -0600)]
avformat/crypto: added encryption

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: mention the noise_bsf parameter in the docs
Christophe Gisquet [Sun, 30 Nov 2014 10:59:22 +0000 (11:59 +0100)]
doc: mention the noise_bsf parameter in the docs

This looks more like a seed than an amount, as the variable name
could lead to think.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'
Michael Niedermayer [Mon, 1 Dec 2014 20:33:07 +0000 (21:33 +0100)]
Merge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'

* commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119':
  Make the RELEASE file match with the most recent tag

Conflicts:
RELEASE

Not merged as the tag is not a FFmpeg version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vorbisdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Mon, 1 Dec 2014 17:10:11 +0000 (18:10 +0100)]
avcodec/vorbisdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opus_celt: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Mon, 1 Dec 2014 17:12:38 +0000 (18:12 +0100)]
avcodec/opus_celt: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wmaprodec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Mon, 1 Dec 2014 17:07:59 +0000 (18:07 +0100)]
avcodec/wmaprodec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Search harder for missing stream information in flv by default
Michael Niedermayer [Mon, 1 Dec 2014 14:26:58 +0000 (15:26 +0100)]
avformat/utils: Search harder for missing stream information in flv by default

Fixes Ticket4133

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMake the RELEASE file match with the most recent tag
Reinhard Tartler [Mon, 1 Dec 2014 03:31:31 +0000 (22:31 -0500)]
Make the RELEASE file match with the most recent tag

4 years agoavcodec/motion_est: use 2x8x8 for interlaced qpel
Michael Niedermayer [Mon, 1 Dec 2014 12:23:24 +0000 (13:23 +0100)]
avcodec/motion_est: use 2x8x8 for interlaced qpel

Fixes out of array read
Fixes Ticket4121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: correct license template for t2h.pm
Andreas Cadhalpun [Sun, 30 Nov 2014 22:47:36 +0000 (23:47 +0100)]
doc: correct license template for t2h.pm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: fix spelling errors
Andreas Cadhalpun [Sun, 30 Nov 2014 22:59:22 +0000 (23:59 +0100)]
doc: fix spelling errors

succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfdec: Reset structural_components_count when allocation fails
Michael Niedermayer [Sun, 30 Nov 2014 22:25:19 +0000 (23:25 +0100)]
avformat/mxfdec: Reset structural_components_count when allocation fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfdec.c: initial support for EssenceGroups
Mark Reid [Sun, 30 Nov 2014 20:16:27 +0000 (12:16 -0800)]
libavformat/mxfdec.c: initial support for EssenceGroups

Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoLICENSE.md: Add tests/reference.pnm
Michael Niedermayer [Sun, 30 Nov 2014 18:09:45 +0000 (19:09 +0100)]
LICENSE.md: Add tests/reference.pnm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'
Michael Niedermayer [Sun, 30 Nov 2014 17:38:22 +0000 (18:38 +0100)]
Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'

* commit '8895bf7b78650c0c21c88cec0484e138ec511a4b':
  Replace lena.pnm

Conflicts:
tests/Makefile
tests/ref/seek/vsynth2-asv1
tests/ref/seek/vsynth2-asv2
tests/ref/seek/vsynth2-ffv1
tests/ref/seek/vsynth2-flashsv
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-huffyuv
tests/ref/seek/vsynth2-ljpeg
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-roqvideo
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth2-asv1
tests/ref/vsynth/vsynth2-asv2
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-ffv1
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-ljpeg
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-adv
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-roqvideo
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v210
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-yuv

See: c4abee734dcbdb589925dd6da98041dcf663ce49
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
Michael Niedermayer [Sun, 30 Nov 2014 17:17:51 +0000 (18:17 +0100)]
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: take bsf arguments from the command line
Christophe Gisquet [Sat, 29 Nov 2014 18:15:02 +0000 (19:15 +0100)]
ffmpeg: take bsf arguments from the command line

The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/adxenc: fix rounding
Michael Niedermayer [Sun, 30 Nov 2014 11:56:02 +0000 (12:56 +0100)]
avcodec/adxenc: fix rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/adxenc: match prediction used in the decoder
Michael Niedermayer [Sun, 30 Nov 2014 11:40:03 +0000 (12:40 +0100)]
avcodec/adxenc: match prediction used in the decoder

The prediction used in the encoder was not correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/atrac3: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sun, 30 Nov 2014 10:23:34 +0000 (11:23 +0100)]
avcodec/atrac3: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libmp3lame: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sun, 30 Nov 2014 10:21:50 +0000 (11:21 +0100)]
avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

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