ffmpeg.git
5 years agoavformat/movenc: AVC Intra support
Michael Niedermayer [Sat, 27 Sep 2014 23:18:43 +0000 (01:18 +0200)]
avformat/movenc: AVC Intra support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: reuse edge emu buffer for coefficients
Christophe Gisquet [Tue, 23 Sep 2014 21:36:43 +0000 (21:36 +0000)]
hevc: reuse edge emu buffer for coefficients

Kind of hackish but...

Reviewed-by: Mickael Raulet <Mickael.Raulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Force mutex to NULL after destruction.
Manfred Georg [Tue, 30 Sep 2014 22:20:42 +0000 (15:20 -0700)]
avcodec/utils: Force mutex to NULL after destruction.

A badly behaving user provided mutex manager (such as that in OpenCV) may not reset the mutex to NULL on destruction.  This can cause a problem for a later mutex manager (which may assert that the mutex is NULL before creating).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: fix avio_flush() for read streams
wm4 [Tue, 30 Sep 2014 16:46:48 +0000 (18:46 +0200)]
avformat/aviobuf: fix avio_flush() for read streams

avio_flush() did nothing useful for read streams. Fix it to behave as
expected, and discard the currently read buffer properly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: When using "-c:d copy", don't require a codec for passing the AMF...
Jeffrey Wescott [Tue, 30 Sep 2014 04:06:38 +0000 (21:06 -0700)]
avformat/flvenc: When using "-c:d copy", don't require a codec for passing the AMF metadata through from input to output.

5 years agoavcodec/bitstream_filter: Use av_bitstream_filter_next() instead of direct access...
Michael Niedermayer [Tue, 30 Sep 2014 16:00:00 +0000 (18:00 +0200)]
avcodec/bitstream_filter: Use av_bitstream_filter_next() instead of direct access in av_bitstream_filter_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/srtdec: use AVBPrint API
Clément Bœsch [Sun, 28 Sep 2014 09:57:46 +0000 (11:57 +0200)]
avcodec/srtdec: use AVBPrint API

5 years agoKill timed SRT
Clément Bœsch [Sun, 14 Sep 2014 18:30:27 +0000 (20:30 +0200)]
Kill timed SRT

5 years agoavcodec/h264_mp4toannexb_bsf: use the given padding in h264_extradata_to_annexb().
Benoit Fouet [Tue, 30 Sep 2014 11:06:30 +0000 (13:06 +0200)]
avcodec/h264_mp4toannexb_bsf: use the given padding in h264_extradata_to_annexb().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream.
Benoit Fouet [Mon, 29 Sep 2014 13:18:50 +0000 (15:18 +0200)]
avcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream.

When only SPS or PPS is present in the stream, copy the missing one from
AVCC before insertion to the output stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRTMP: fix FD leak in rtmp_open()
Alexander Drozdov [Thu, 25 Sep 2014 22:45:08 +0000 (09:45 +1100)]
RTMP: fix FD leak in rtmp_open()

If we setup AVIO interrupt callback and it will be returns 1 on socket
timeouts and we try to connect to non-existing streams on some servers
(like nginx-rtmp) we got FD leak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Fix leak on bitstream buffer reallocation
Michael Niedermayer [Tue, 30 Sep 2014 03:11:19 +0000 (05:11 +0200)]
avcodec/mpegvideo_enc: Fix leak on bitstream buffer reallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Allocate only a small buffer and reallocate as needed
Michael Niedermayer [Mon, 29 Sep 2014 03:42:59 +0000 (05:42 +0200)]
avcodec/mpegvideo_enc: Allocate only a small buffer and reallocate as needed

This should reduce the memory requirement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'
Michael Niedermayer [Mon, 29 Sep 2014 19:25:09 +0000 (21:25 +0200)]
Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'

* commit '19133e96d30e3f80dbae236ef081aedef419a6bf':
  lavf: fix memleaks in avformat_find_stream_info()

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'
Michael Niedermayer [Mon, 29 Sep 2014 19:02:45 +0000 (21:02 +0200)]
Merge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'

* commit '2cd7c99498b1bcb450c328459cf85a686ce83456':
  h264: reset ret to avoid propagating minor failures

See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e3a00acde05c925617dc19b5373969d864bf8414'
Michael Niedermayer [Mon, 29 Sep 2014 18:33:09 +0000 (20:33 +0200)]
Merge commit 'e3a00acde05c925617dc19b5373969d864bf8414'

* commit 'e3a00acde05c925617dc19b5373969d864bf8414':
  hevc: Initialize mergecand_list to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'
Michael Niedermayer [Mon, 29 Sep 2014 18:26:12 +0000 (20:26 +0200)]
Merge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'

* commit 'a05f5052fef3b3743fab7846da12861d8a8098ec':
  sdp: Make opus declaration conform to the spec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: fix memleaks in avformat_find_stream_info()
Justin Ruggles [Mon, 16 Sep 2013 19:51:46 +0000 (15:51 -0400)]
lavf: fix memleaks in avformat_find_stream_info()

When AVFMT_FLAG_NOBUFFER is set, the packets are not added to the
AVFormatContext packet list, so they need to be freed when they are
no longer needed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/put_bits: Add rebase_put_bits()
Michael Niedermayer [Mon, 29 Sep 2014 03:42:24 +0000 (05:42 +0200)]
avcodec/put_bits: Add rebase_put_bits()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: reset ret to avoid propagating minor failures
Michael Niedermayer [Sat, 27 Sep 2014 23:46:50 +0000 (00:46 +0100)]
h264: reset ret to avoid propagating minor failures

Unbreak 772d150a6e82542c06b0c251e73dd299d98d1027.

CC: libav-stable@libav.org
Bug-Id: 750 / 905753
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohevc: Initialize mergecand_list to 0
Luca Barbato [Wed, 17 Sep 2014 17:51:40 +0000 (19:51 +0200)]
hevc: Initialize mergecand_list to 0

Unbreak cf6090dc6252f2b276aa4133e3d73a89f4c6046c.

CC: libav-stable@libav.org
Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1

5 years agoavcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc()
Michael Niedermayer [Mon, 29 Sep 2014 03:41:54 +0000 (05:41 +0200)]
avcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosdp: Make opus declaration conform to the spec
Timothy B. Terriberry [Thu, 25 Sep 2014 00:43:22 +0000 (17:43 -0700)]
sdp: Make opus declaration conform to the spec

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat/hlsenc: fix outter typo
Michael Niedermayer [Sun, 28 Sep 2014 22:19:43 +0000 (00:19 +0200)]
avformat/hlsenc: fix outter typo

Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first encoding attempt
Michael Niedermayer [Sun, 28 Sep 2014 21:40:02 +0000 (23:40 +0200)]
avcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first encoding attempt

This reduces repeatly re-encoding to achieve VBV compliance

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: export inner muxer timebase
Michael Niedermayer [Sun, 28 Sep 2014 20:27:33 +0000 (22:27 +0200)]
avformat/hlsenc: export inner muxer timebase

Fixes "Non-monotonous DTS in output stream 0:0"
Fies Ticket 3797

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lls: Make unchanged function arguments const
Michael Niedermayer [Sun, 28 Sep 2014 13:44:38 +0000 (15:44 +0200)]
avutil/lls: Make unchanged function arguments const

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse*
Michael Niedermayer [Sun, 28 Sep 2014 16:56:54 +0000 (18:56 +0200)]
avcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse*

Fixes acodec-dca2 fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pca: Make argument of ff_pca_add() const
Michael Niedermayer [Sun, 28 Sep 2014 14:13:18 +0000 (16:13 +0200)]
avutil/pca: Make argument of ff_pca_add() const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1dec: Fixing is_intra, 2nd attempt
Michael Niedermayer [Sun, 28 Sep 2014 13:02:14 +0000 (15:02 +0200)]
avcodec/vc1dec: Fixing is_intra, 2nd attempt

This also un-does the fate changes from a52f443714b5c2a40ed272d8445f4c39220a4b69,
leaving this fix without even small differences in the output, that is
a sample for which this makes a vissible difference is very welcome

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1dec: fix is_intra block vs. mb bug
Michael Niedermayer [Sun, 28 Sep 2014 12:00:06 +0000 (14:00 +0200)]
avcodec/vc1dec: fix is_intra block vs. mb bug

Fixes CID1194380

There are no vissible differences in the changed fate samples. Only
a tiny number of pixels change by tiny amounts in the frames i checked
If someone has a file that shows a vissible difference, please post it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: add noexecstack to linker options if supported.
Reimar Döffinger [Sun, 21 Sep 2014 08:58:10 +0000 (09:58 +0100)]
configure: add noexecstack to linker options if supported.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/libx265: enable psnr reporting when requested by the user
Michael Niedermayer [Tue, 9 Sep 2014 23:38:58 +0000 (01:38 +0200)]
avcodec/libx265: enable psnr reporting when requested by the user

This is similar to what is done in libx264.c

Fixes Ticket3567

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libx264: mark unchanged pointer arguments as const
Michael Niedermayer [Sun, 28 Sep 2014 01:40:13 +0000 (03:40 +0200)]
avcodec/libx264: mark unchanged pointer arguments as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: Added parameter -hls_allow_cache
Joakim Roubert [Mon, 22 Sep 2014 08:17:01 +0000 (10:17 +0200)]
avformat/hlsenc: Added parameter -hls_allow_cache

The -hls_allow_cache parameter enables explicitly setting the
EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates
whether the client MAY or MUST NOT cache downloaded media
segments for later replay.

Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE
will not show in the manifest for other values (or if
-hls_allow_cache is not used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Add basic PCM audio support.
Thilo Borgmann [Tue, 23 Sep 2014 15:06:37 +0000 (17:06 +0200)]
lavd/avfoundation: Add basic PCM audio support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3enc_template: fix out of array read
Michael Niedermayer [Sat, 27 Sep 2014 18:34:44 +0000 (20:34 +0200)]
avcodec/ac3enc_template: fix out of array read

Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '551746680462538bb5ad7adf55fb1248190428ec'
Michael Niedermayer [Sat, 27 Sep 2014 16:21:23 +0000 (18:21 +0200)]
Merge commit '551746680462538bb5ad7adf55fb1248190428ec'

* commit '551746680462538bb5ad7adf55fb1248190428ec':
  configure: Provide a safe default for unknonw libcs

Conflicts:
configure

This is not merged as it does not work with musl here, while
our previous solution does.

See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Provide a safe default for unknonw libcs
Luca Barbato [Sat, 27 Sep 2014 15:57:23 +0000 (17:57 +0200)]
configure: Provide a safe default for unknonw libcs

Support musl out of box.

Amend commit 9d2cee52d37c7340f85a5d41110282aac03e6855 that got
wrongly merged in its stead.

5 years agoavcodec/subviewerdec: remove old compat code
Clément Bœsch [Sat, 20 Sep 2014 20:30:26 +0000 (22:30 +0200)]
avcodec/subviewerdec: remove old compat code

5 years agoavcodec/microdvddec: remove old compat code
Clément Bœsch [Sat, 20 Sep 2014 20:30:11 +0000 (22:30 +0200)]
avcodec/microdvddec: remove old compat code

5 years agoavformat/assdec: make sure to free allocated data in case of error
Clément Bœsch [Sat, 27 Sep 2014 15:49:49 +0000 (17:49 +0200)]
avformat/assdec: make sure to free allocated data in case of error

5 years agoavformat/assenc: mux an event header if none are found in extradata
Clément Bœsch [Sat, 20 Sep 2014 19:37:01 +0000 (21:37 +0200)]
avformat/assenc: mux an event header if none are found in extradata

5 years agoavformat/assdec: add myself to Copyright
Clément Bœsch [Sat, 20 Sep 2014 17:31:52 +0000 (19:31 +0200)]
avformat/assdec: add myself to Copyright

5 years agoavformat/assdec: reindent after previous commit
Clément Bœsch [Sat, 20 Sep 2014 17:31:29 +0000 (19:31 +0200)]
avformat/assdec: reindent after previous commit

5 years agoavformat/assdec: make sure "Comments:" events end up in the header
Clément Bœsch [Sat, 20 Sep 2014 17:15:31 +0000 (19:15 +0200)]
avformat/assdec: make sure "Comments:" events end up in the header

5 years agoavformat/assdec: output ASS packets
Clément Bœsch [Sun, 14 Sep 2014 07:35:10 +0000 (09:35 +0200)]
avformat/assdec: output ASS packets

After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.

And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.

5 years agoavutil/x86/cpu: fix cpuid sub-leaf selection
lvqcl [Sat, 27 Sep 2014 11:21:31 +0000 (13:21 +0200)]
avutil/x86/cpu: fix cpuid sub-leaf selection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/fate/microsoft: add -flags +bitexact to ilaced_twomv
Michael Niedermayer [Sat, 27 Sep 2014 11:00:25 +0000 (13:00 +0200)]
tests/fate/microsoft: add -flags +bitexact to ilaced_twomv

Should fix fate failure on alpha and pre sse2 x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: remove CodingTree
Christophe Gisquet [Tue, 23 Sep 2014 21:36:41 +0000 (21:36 +0000)]
hevc: remove CodingTree

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/signalstats: add more pixel formats
Paul B Mahol [Thu, 25 Sep 2014 17:25:00 +0000 (17:25 +0000)]
avfilter/signalstats: add more pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoffplay: Separate AVFrame from AVSubtitle
Michael Niedermayer [Fri, 26 Sep 2014 16:11:16 +0000 (18:11 +0200)]
ffplay: Separate AVFrame from AVSubtitle

This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
Michael Niedermayer [Sat, 27 Sep 2014 01:38:12 +0000 (03:38 +0200)]
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'

* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce42316321145c435029dc288c2b5f1d48519dde'
Michael Niedermayer [Sat, 27 Sep 2014 01:16:58 +0000 (03:16 +0200)]
Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'

* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
  h264: Always invoke the get_format() callback

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
Michael Niedermayer [Sat, 27 Sep 2014 00:42:30 +0000 (02:42 +0200)]
Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'

* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
  hwaccel: Call ->get_format again if hwaccel init fails

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'
Michael Niedermayer [Sat, 27 Sep 2014 00:12:21 +0000 (02:12 +0200)]
Merge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'

* commit '9d2cee52d37c7340f85a5d41110282aac03e6855':
  configure: Assume a standard-compliant default libc

See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Note, the change is not merged to avoid breaking netbsd and others.
once the netbsd (and any other breakages are dealt with the
else based solution could be used and 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
could then be reverted)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'
Michael Niedermayer [Fri, 26 Sep 2014 23:49:24 +0000 (01:49 +0200)]
Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'

* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}
James Almer [Fri, 26 Sep 2014 23:46:41 +0000 (20:46 -0300)]
x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}

About two times faster than the c wrapper.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '883e98bc25755327565d8ae0f565a6c886f24816'
Michael Niedermayer [Fri, 26 Sep 2014 23:35:46 +0000 (01:35 +0200)]
Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'

* commit '883e98bc25755327565d8ae0f565a6c886f24816':
  probe: Bump the score for mime type matching

Conflicts:
libavformat/format.c

See: bcac0f401001e6ebb0ae2718cc42d30b2009de4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd995f0a1550c9148140eab34c7d770e90925c004'
Michael Niedermayer [Fri, 26 Sep 2014 23:29:24 +0000 (01:29 +0200)]
Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'

* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
libavutil/log.c

No change, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavfilter/af_amix: avoid derreferencing possible null
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 19:37:28 +0000 (16:37 -0300)]
libavfilter/af_amix: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241516

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agolibavfilter/af_channelmap: avoid derreferencing possible null
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 16:58:22 +0000 (13:58 -0300)]
libavfilter/af_channelmap: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241517

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agolibavfilter/af_join: avoid derreferencing possible null
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 15:52:09 +0000 (12:52 -0300)]
libavfilter/af_join: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241518

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoMerge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
Michael Niedermayer [Fri, 26 Sep 2014 20:27:37 +0000 (22:27 +0200)]
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'

* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
  flac: Remove unused headers

Conflicts:
libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'
Michael Niedermayer [Fri, 26 Sep 2014 20:18:07 +0000 (22:18 +0200)]
Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'

* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
Michael Niedermayer [Fri, 26 Sep 2014 20:06:46 +0000 (22:06 +0200)]
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'

* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b39ebcddd47daf37659796aaa7d068668086507a'
Michael Niedermayer [Fri, 26 Sep 2014 19:00:27 +0000 (21:00 +0200)]
Merge commit 'b39ebcddd47daf37659796aaa7d068668086507a'

* commit 'b39ebcddd47daf37659796aaa7d068668086507a':
  fate: Add VC-1 interlaced twomv test

Note, this test is not free of artifacts on both sides of the merge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg12: Always invoke the get_format() callback
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:58 +0000 (11:59 +0300)]
mpeg12: Always invoke the get_format() callback

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoh264: Always invoke the get_format() callback
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:57 +0000 (11:59 +0300)]
h264: Always invoke the get_format() callback

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agohwaccel: Call ->get_format again if hwaccel init fails
Rémi Denis-Courmont [Tue, 16 Sep 2014 19:17:47 +0000 (22:17 +0300)]
hwaccel: Call ->get_format again if hwaccel init fails

This allows the application to fall back on another hwaccel or,
more likely, software decoding.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoconfigure: Assume a standard-compliant default libc
Luca Barbato [Thu, 11 Sep 2014 13:48:13 +0000 (15:48 +0200)]
configure: Assume a standard-compliant default libc

Non-standard compliant libc should be supported on a per-case basis
anyway.

5 years agoavconv: Use only audio and video to guess discontinuities
Luca Barbato [Sat, 13 Sep 2014 00:00:32 +0000 (02:00 +0200)]
avconv: Use only audio and video to guess discontinuities

Data and subtitle streams might cause false positive.

5 years agoprobe: Bump the score for mime type matching
Andreas Cadhalpun [Fri, 12 Sep 2014 23:25:22 +0000 (01:25 +0200)]
probe: Bump the score for mime type matching

It should be more trustworthy than extension matching.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolog: Unbreak no-tty support on 256color terminals
Luca Barbato [Fri, 12 Sep 2014 22:26:21 +0000 (00:26 +0200)]
log: Unbreak no-tty support on 256color terminals

5 years agoMerge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'
Michael Niedermayer [Fri, 26 Sep 2014 18:53:48 +0000 (20:53 +0200)]
Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'

* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
Michael Niedermayer [Fri, 26 Sep 2014 18:47:11 +0000 (20:47 +0200)]
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflac: Remove unused headers
Tristan Matthews [Fri, 12 Sep 2014 22:50:03 +0000 (18:50 -0400)]
flac: Remove unused headers

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
Tim Walker [Tue, 18 Feb 2014 02:39:52 +0000 (03:39 +0100)]
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

This is actually defined in the A/52 specification.

5 years agoac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Tim Walker [Tue, 18 Feb 2014 02:39:51 +0000 (03:39 +0100)]
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Some encoders already use this value even
though it's reserved in the A/52 specification.

5 years agofate: Add VC-1 interlaced twomv test
Tim Walker [Sun, 21 Sep 2014 15:16:33 +0000 (16:16 +0100)]
fate: Add VC-1 interlaced twomv test

CC: libav-stable@libav.org
5 years agovc1: Use logical instead of bitwise or for twomv
Michael Niedermayer [Sun, 21 Sep 2014 15:16:32 +0000 (16:16 +0100)]
vc1: Use logical instead of bitwise or for twomv

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
5 years agovc1: Use logical instead of bitwise or for coded_inter
Tim Walker [Thu, 25 Sep 2014 16:34:26 +0000 (18:34 +0200)]
vc1: Use logical instead of bitwise or for coded_inter

This appears to be the intended behavior.

5 years agolibavformat/iff: print error message when DSDIFF compression type is not supported
Peter Ross [Fri, 26 Sep 2014 05:44:46 +0000 (15:44 +1000)]
libavformat/iff: print error message when DSDIFF compression type is not supported

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dxtory: remove unused variables
Michael Niedermayer [Fri, 26 Sep 2014 10:47:21 +0000 (12:47 +0200)]
avcodec/dxtory: remove unused variables

Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
Michael Niedermayer [Fri, 26 Sep 2014 10:29:41 +0000 (12:29 +0200)]
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'

* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'
Michael Niedermayer [Fri, 26 Sep 2014 10:23:55 +0000 (12:23 +0200)]
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Use microseconds as common timebase.
Thilo Borgmann [Tue, 23 Sep 2014 14:49:59 +0000 (16:49 +0200)]
lavd/avfoundation: Use microseconds as common timebase.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcm-dvd: Move a variable to a smaller scope
Diego Biurrun [Fri, 26 Sep 2014 07:42:52 +0000 (00:42 -0700)]
pcm-dvd: Move a variable to a smaller scope

This avoids an unused variable warning on big-endian systems.

5 years agoavformat/srtdec: simpler and more lenient probing
Clément Bœsch [Fri, 26 Sep 2014 05:29:22 +0000 (07:29 +0200)]
avformat/srtdec: simpler and more lenient probing

Fixes Ticket #3935.

5 years agoavformat: add SUP/PGS subtitle demuxer
wm4 [Wed, 24 Sep 2014 15:38:58 +0000 (17:38 +0200)]
avformat: add SUP/PGS subtitle demuxer

Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agocaf: Give context structure a consistent name
Diego Biurrun [Thu, 25 Sep 2014 14:42:30 +0000 (16:42 +0200)]
caf: Give context structure a consistent name

5 years agolavd/avfoundation: Simplify debug message generation.
Thilo Borgmann [Tue, 23 Sep 2014 14:49:16 +0000 (16:49 +0200)]
lavd/avfoundation: Simplify debug message generation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Using the actual stream index instead of hardcoded value.
Thilo Borgmann [Tue, 23 Sep 2014 14:48:06 +0000 (16:48 +0200)]
lavd/avfoundation: Using the actual stream index instead of hardcoded value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Split adding a device and getting the device configuration into...
Thilo Borgmann [Wed, 24 Sep 2014 10:16:31 +0000 (12:16 +0200)]
lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect jpg images.
Carl Eugen Hoyos [Thu, 25 Sep 2014 21:02:06 +0000 (23:02 +0200)]
Autodetect jpg images.

Based on 2d3842f5 by Michael Niedermayer.

Fixes ticket #2541.

5 years agoSupport libopenjpeg 2.x via libopenmj2.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:35:39 +0000 (22:35 +0200)]
Support libopenjpeg 2.x via libopenmj2.

Based on a patch by Marius Cirsta.

Fixes ticket #2016.

5 years agoShow correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:33:31 +0000 (22:33 +0200)]
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.

5 years agoavcodec/dxtory: Support dxtory-2.0.127.avi
Michael Niedermayer [Thu, 25 Sep 2014 21:42:03 +0000 (23:42 +0200)]
avcodec/dxtory: Support dxtory-2.0.127.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/x86/idctdsp.h: Fix make checkheaders.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:18:25 +0000 (22:18 +0200)]
lavc/x86/idctdsp.h: Fix make checkheaders.

5 years agoavcodec/svq1enc: align buffer used by simd functions
James Almer [Thu, 25 Sep 2014 18:17:13 +0000 (15:17 -0300)]
avcodec/svq1enc: align buffer used by simd functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>