ffmpeg.git
5 years agoavcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer
Michael Niedermayer [Tue, 14 Oct 2014 16:52:51 +0000 (18:52 +0200)]
avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as...
Michael Niedermayer [Tue, 14 Oct 2014 16:30:52 +0000 (18:30 +0200)]
avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 14 Oct 2014 16:30:15 +0000 (18:30 +0200)]
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 14 Oct 2014 16:29:49 +0000 (18:29 +0200)]
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pp: add gbrp support
Michael Niedermayer [Tue, 14 Oct 2014 15:15:56 +0000 (17:15 +0200)]
avfilter/vf_pp: add gbrp support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3enc: use initial_padding
Michael Niedermayer [Tue, 14 Oct 2014 01:53:17 +0000 (03:53 +0200)]
avformat/mp3enc: use initial_padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Fix stream copy with initial_padding
Michael Niedermayer [Tue, 14 Oct 2014 01:30:03 +0000 (03:30 +0200)]
ffmpeg: Fix stream copy with initial_padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'
Michael Niedermayer [Tue, 14 Oct 2014 01:00:17 +0000 (03:00 +0200)]
Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'

* commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0':
  lavf: use initial_padding instead of deprecated delay

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3enc_template: use the initial_padding field
Michael Niedermayer [Tue, 14 Oct 2014 00:46:51 +0000 (02:46 +0200)]
avcodec/ac3enc_template: use the initial_padding field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'
Michael Niedermayer [Tue, 14 Oct 2014 00:16:16 +0000 (02:16 +0200)]
Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'

* commit '2df0c32ea12ddfa72ba88309812bfb13b674130f':
  lavc: use a separate field for exporting audio encoder padding

Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/avcodec.h
libavcodec/libvorbisenc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: print element types when debug startcode is set
Michael Niedermayer [Mon, 13 Oct 2014 23:54:13 +0000 (01:54 +0200)]
avcodec/aacdec: print element types when debug startcode is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'
Michael Niedermayer [Mon, 13 Oct 2014 22:03:43 +0000 (00:03 +0200)]
Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'

* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e':
  h263dec: call get_format() on resolution changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: print more information with av_dlog() in compute_pkt_fields()
Michael Niedermayer [Mon, 13 Oct 2014 21:45:52 +0000 (23:45 +0200)]
avformat/utils: print more information with av_dlog() in compute_pkt_fields()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'
Michael Niedermayer [Mon, 13 Oct 2014 20:12:56 +0000 (22:12 +0200)]
Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'

* commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9':
  h263dec: call get_format after setting resolution and profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: use initial_padding instead of deprecated delay
Anton Khirnov [Sat, 23 Aug 2014 13:12:51 +0000 (13:12 +0000)]
lavf: use initial_padding instead of deprecated delay

5 years agolavc: use a separate field for exporting audio encoder padding
Anton Khirnov [Sat, 23 Aug 2014 12:40:50 +0000 (12:40 +0000)]
lavc: use a separate field for exporting audio encoder padding

Currently, the amount of padding inserted at the beginning by some audio
encoders, is exported through AVCodecContext.delay. However
- the term 'delay' is heavily overloaded and can have multiple different
  meanings even in the case of audio encoding.
- this field has entirely different meanings, depending on whether the
  codec context is used for encoding or decoding (and has yet another
  different meaning for video), preventing generic handling of the codec
  context.

Therefore, add a new field -- AVCodecContext.initial_padding. It could
conceivably be used for decoding as well at a later point.

5 years agoavformat/movenc: add support for syncframes concatenation for E-AC-3.
Benoit Fouet [Mon, 13 Oct 2014 07:35:11 +0000 (09:35 +0200)]
avformat/movenc: add support for syncframes concatenation for E-AC-3.

E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes
in order to achieve this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: map LFE[0] to SCE[1] for 4.0 audio.
Benoit Fouet [Mon, 13 Oct 2014 12:42:55 +0000 (14:42 +0200)]
avcodec/aacdec: map LFE[0] to SCE[1] for 4.0 audio.

Fixes ticket #3930

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopostproc: fix qp count
Michael Niedermayer [Mon, 13 Oct 2014 14:02:42 +0000 (16:02 +0200)]
postproc: fix qp count

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: fix mix of declaration and statement
Michael Niedermayer [Mon, 13 Oct 2014 11:36:06 +0000 (13:36 +0200)]
avformat/mov: fix mix of declaration and statement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh263dec: call get_format() on resolution changes
Rémi Denis-Courmont [Wed, 8 Oct 2014 17:37:01 +0000 (20:37 +0300)]
h263dec: call get_format() on resolution changes

Fail safe if the pixel format changes.

5 years agoh263dec: call get_format after setting resolution and profile
Rémi Denis-Courmont [Wed, 8 Oct 2014 17:37:00 +0000 (20:37 +0300)]
h263dec: call get_format after setting resolution and profile

Bug-Id: 541

5 years agolibavcodec/libtwolame: fix null pointer dereference
Paul B Mahol [Mon, 13 Oct 2014 12:22:41 +0000 (12:22 +0000)]
libavcodec/libtwolame: fix null pointer dereference

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agomov.c: allow reading fragment start dts/pts from fragmented mp4
Mika Raento [Sat, 11 Oct 2014 15:43:48 +0000 (18:43 +0300)]
mov.c: allow reading fragment start dts/pts from fragmented mp4

This introduces a new option to the mov demuxer: -use_mfra_for
(pts|dts). When it's given and moofs and a MFRA are present, the MFRA's
TFRAs are read for fragment start times.

Unfortunately some programs that produce fragmented mp4s use the TFRA
time field for dts and some for pts. There is no realistic way to detect
which is the case, hence the responsibility is punted onto the user.
This also means that no behavioural change is enabled by default - you
must pass either dts or pts for anything to happen.

Without this change, timestamps for some discontinuous fragmented mp4 are
wrong, and cause audio/video desync and are not usable for generating
HLS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pp: support AV_PIX_FMT_GRAY8
Michael Niedermayer [Sun, 12 Oct 2014 23:56:14 +0000 (01:56 +0200)]
avfilter/vf_pp: support AV_PIX_FMT_GRAY8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibpostproc: support grayscale
Michael Niedermayer [Sun, 12 Oct 2014 23:55:36 +0000 (01:55 +0200)]
libpostproc: support grayscale

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '76c70e33d2244a688832f03b53862eb5d9ad3b01'
Michael Niedermayer [Sun, 12 Oct 2014 23:26:48 +0000 (01:26 +0200)]
Merge commit '76c70e33d2244a688832f03b53862eb5d9ad3b01'

* commit '76c70e33d2244a688832f03b53862eb5d9ad3b01':
  icecast: Do not use chunked post

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d'
Michael Niedermayer [Sun, 12 Oct 2014 23:15:13 +0000 (01:15 +0200)]
Merge commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d'

* commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d':
  movenc: Simplify code by using an existing local pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'
Michael Niedermayer [Sun, 12 Oct 2014 23:10:13 +0000 (01:10 +0200)]
Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'

* commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e':
  movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee'
Michael Niedermayer [Sun, 12 Oct 2014 21:26:28 +0000 (23:26 +0200)]
Merge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee'

* commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee':
  movenc: Write edit lists for fragmented files as well, if necessary

Conflicts:
libavformat/movenc.c

The default for writing EDTS for fragmented mp4 is left at disabled
this can be overridden via command line with -use_editlist
but EDTS + fragments still does not fully work, which is why it is
left disabled by default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add test for vp90-2-trac3849.webm
James Almer [Sun, 12 Oct 2014 20:18:47 +0000 (17:18 -0300)]
fate: add test for vp90-2-trac3849.webm

Regression test for the bug from trac ticket #3849 fixed in commit 14e30255

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'
Michael Niedermayer [Sun, 12 Oct 2014 20:48:17 +0000 (22:48 +0200)]
Merge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'

* commit '95ee4e2ce774e0339632d067161596bf3dadfc72':
  movenc: Add some comments explaining subtle details in writing the edit lists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '72f801619a1ae91969fee9a7d72519422433c998'
Michael Niedermayer [Sun, 12 Oct 2014 20:37:33 +0000 (22:37 +0200)]
Merge commit '72f801619a1ae91969fee9a7d72519422433c998'

* commit '72f801619a1ae91969fee9a7d72519422433c998':
  movenc: Adjust edit lists to trim out parts of tracks with negative pts

Conflicts:
libavformat/movenc.c

See: 66b45d8f7a1bfba1065286361ab571cb9cfd87c6
See: 14fd34d73bb0bcb227b62506fb51d63751c9b190
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'
Michael Niedermayer [Sun, 12 Oct 2014 20:29:10 +0000 (22:29 +0200)]
Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'

* commit '8bef43388132b53f59a6e90add18900a3bb4cc60':
  smoothstreamingenc: Simplify code by removing a redundant variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopostproc/postprocess: fix quant store for fq mode
Michael Niedermayer [Sun, 12 Oct 2014 18:26:27 +0000 (20:26 +0200)]
postproc/postprocess: fix quant store for fq mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pp: add yuv 4:4:0 support
Michael Niedermayer [Sun, 12 Oct 2014 17:13:20 +0000 (19:13 +0200)]
avfilter/vf_pp: add yuv 4:4:0 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopostprocess: add YUV 4:4:0 support
Michael Niedermayer [Sun, 12 Oct 2014 17:11:53 +0000 (19:11 +0200)]
postprocess: add YUV 4:4:0 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft
James Almer [Sun, 12 Oct 2014 18:54:58 +0000 (15:54 -0300)]
avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft

5 years agoicecast: Do not use chunked post
Mark McGough [Sun, 12 Oct 2014 10:24:07 +0000 (18:24 +0800)]
icecast: Do not use chunked post

Icecast uses HTTP 1.0 while Libav uses HTTP 1.1 and enables by
default chunked post.

Icecast actually forwards the HTTP chunk headers to the listener
as part of the media stream (without the chunk encoding HTTP headers)
causing the players to lose sync.

Disabling the option is enough to feed icecast properly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomovenc: Simplify code by using an existing local pointer
Martin Storsjö [Sat, 11 Oct 2014 21:14:48 +0000 (00:14 +0300)]
movenc: Simplify code by using an existing local pointer

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Print a warning for an unhandled case of nonzero start dts with empty_moov
Martin Storsjö [Sat, 11 Oct 2014 21:33:24 +0000 (00:33 +0300)]
movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Write edit lists for fragmented files as well, if necessary
Martin Storsjö [Sat, 11 Oct 2014 21:03:25 +0000 (00:03 +0300)]
movenc: Write edit lists for fragmented files as well, if necessary

This is necessary to get the right timestamp offset for content
that starts with dts != 0.

This currently only helps when writing fragmented files with a non-empty
moov atom. When writing an empty moov atom, we don't have any packets
yet, so we don't know the starting dts for the tracks.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Add some comments explaining subtle details in writing the edit lists
Martin Storsjö [Sat, 11 Oct 2014 20:56:24 +0000 (23:56 +0300)]
movenc: Add some comments explaining subtle details in writing the edit lists

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Adjust edit lists to trim out parts of tracks with negative pts
Michael Niedermayer [Sat, 29 Sep 2012 04:31:18 +0000 (06:31 +0200)]
movenc: Adjust edit lists to trim out parts of tracks with negative pts

This makes sure that audio preroll for e.g. AAC is signaled correctly.

Previously we only wrote the edit list correctly if we had negative
dts but started with pts == 0 (e.g. for video with B-frames).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agosmoothstreamingenc: Simplify code by removing a redundant variable
Martin Storsjö [Mon, 6 Oct 2014 07:06:37 +0000 (10:06 +0300)]
smoothstreamingenc: Simplify code by removing a redundant variable

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/eatgv: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 12 Oct 2014 10:22:00 +0000 (12:22 +0200)]
avcodec/eatgv: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/eatqi: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 12 Oct 2014 10:22:00 +0000 (12:22 +0200)]
avcodec/eatqi: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: avoid pointer arithmetic with NULL
Michael Niedermayer [Sun, 12 Oct 2014 02:46:55 +0000 (04:46 +0200)]
avcodec/error_resilience: avoid pointer arithmetic with NULL

move the code after the existing NULL check
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'
Michael Niedermayer [Sat, 11 Oct 2014 22:52:46 +0000 (00:52 +0200)]
Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'

* commit 'bd239c9a2e151c0aeeb653a571f130aae7320894':
  lavf: Don't drop both pts and dts if timestamps are invalid

Conflicts:
libavformat/utils.c
tests/ref/fate/vc1-ism

See: cd6851c5ef281e44af7028e08597c4dfb73d880f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: Don't drop both pts and dts if timestamps are invalid
Michael Niedermayer [Wed, 16 Nov 2011 00:19:35 +0000 (01:19 +0100)]
lavf: Don't drop both pts and dts if timestamps are invalid

In these cases, only drop dts. Because if we drop both we have no
timestamps at all for some files.

This improves playback of HLS streams from GoPro cameras.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/mjpegdec: sanity check bits
Michael Niedermayer [Sat, 11 Oct 2014 22:25:47 +0000 (00:25 +0200)]
avcodec/mjpegdec: sanity check bits

Fixes undefined shift
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_drawtext: add missing clear of pointers after av_expr_free()
Karl Kiniger [Sat, 11 Oct 2014 20:34:11 +0000 (22:34 +0200)]
vf_drawtext: add missing clear of pointers after av_expr_free()

Fixes segfault when using sendcmd with drawtext.

Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE
evaluates to 0.

Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dct: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sat, 11 Oct 2014 20:50:51 +0000 (22:50 +0200)]
avcodec/dct: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dirac_parser: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sat, 11 Oct 2014 20:50:51 +0000 (22:50 +0200)]
avcodec/dirac_parser: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/eamad: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sat, 11 Oct 2014 20:50:51 +0000 (22:50 +0200)]
avcodec/eamad: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: abort if -to <= -ss
Simon Thelen [Fri, 10 Oct 2014 21:04:01 +0000 (23:04 +0200)]
ffmpeg_opt: abort if -to <= -ss

Makes ffmpeg abort instead of continuing when stop_time <= start_time.

Closes ticket #4015.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoproresenc_ks: use chroma sampling in autoselection
Christophe Gisquet [Sat, 30 Aug 2014 13:04:03 +0000 (15:04 +0200)]
proresenc_ks: use chroma sampling in autoselection

If the chroma planes aren't subsampled, automatically select
the 4:4:4:4 profile.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lzo: fix resource leak
Ruoyu [Sat, 11 Oct 2014 03:50:20 +0000 (11:50 +0800)]
avutil/lzo: fix resource leak

Signed-off-by: Ruoyu <liangry@ucweb.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: support internal scaler cascades
Michael Niedermayer [Wed, 8 Oct 2014 00:05:54 +0000 (02:05 +0200)]
swscale: support internal scaler cascades

Fixes Ticket3170

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: print aspect_ratio_info in debug output
Michael Niedermayer [Sat, 11 Oct 2014 01:22:16 +0000 (03:22 +0200)]
avcodec/mpeg12dec: print aspect_ratio_info in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1d4579e38ecad578c86516fad2837a273d11b320'
Michael Niedermayer [Fri, 10 Oct 2014 21:35:41 +0000 (23:35 +0200)]
Merge commit '1d4579e38ecad578c86516fad2837a273d11b320'

* commit '1d4579e38ecad578c86516fad2837a273d11b320':
  tcp: Add AVOption support

Conflicts:
libavformat/tcp.c

See: 2e009c6042bde419599ebed9165e597bbef23b2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/assenc: make sure we crawl extradata only if it's non-null
Clément Bœsch [Fri, 10 Oct 2014 21:49:38 +0000 (23:49 +0200)]
avformat/assenc: make sure we crawl extradata only if it's non-null

5 years agoMerge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'
Michael Niedermayer [Fri, 10 Oct 2014 19:44:17 +0000 (21:44 +0200)]
Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119'

* commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119':
  tls: Support passing old-style tcp options

See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'
Michael Niedermayer [Fri, 10 Oct 2014 19:36:08 +0000 (21:36 +0200)]
Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'

* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f':
  rtsp: Add rtsps to the probe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb'
Michael Niedermayer [Fri, 10 Oct 2014 19:28:50 +0000 (21:28 +0200)]
Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb'

* commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb':
  rtsp: Support tls when in listen mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'
Michael Niedermayer [Fri, 10 Oct 2014 19:18:41 +0000 (21:18 +0200)]
Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9'

* commit '8b2e9636c57b22582143467a8a06b509b47b92f9':
  rtsp: Support tls-encapsulated RTSP

Conflicts:
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c27328e749ff3be648411765cd17362fee017341'
Michael Niedermayer [Fri, 10 Oct 2014 19:05:49 +0000 (21:05 +0200)]
Merge commit 'c27328e749ff3be648411765cd17362fee017341'

* commit 'c27328e749ff3be648411765cd17362fee017341':
  rtsp: Check for command strings without spaces

Conflicts:
libavformat/rtspdec.c

See: a0568ed2544025de3c66dd500811f5ba43f38af4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'
Michael Niedermayer [Fri, 10 Oct 2014 18:51:52 +0000 (20:51 +0200)]
Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'

* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
libavformat/sctp.c

See: 2e59142fa9a0db5fab8aa2e676ba524f61280b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'
Michael Niedermayer [Fri, 10 Oct 2014 18:34:14 +0000 (20:34 +0200)]
Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'

* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
  lavf: More informative error message

Conflicts:
libavformat/mux.c

See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoutvideoenc: properly set slice height/last line
Christophe Gisquet [Thu, 9 Oct 2014 21:27:38 +0000 (23:27 +0200)]
utvideoenc: properly set slice height/last line

Mimic decoder and obey sampling.

Does not affect fate tests for utvideo.
Fixes ticket #3949.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/softfloat: Fix undefined shift in av_add_sf()
Michael Niedermayer [Fri, 10 Oct 2014 17:36:12 +0000 (19:36 +0200)]
avutil/softfloat: Fix undefined shift in av_add_sf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: add EAC3 muxing support.
Benoit Fouet [Tue, 7 Oct 2014 12:57:19 +0000 (14:57 +0200)]
avformat/movenc: add EAC3 muxing support.

Support only one independent substream right now, and only syncframes
containing 6 blocks.

Fixes part of ticket #3074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofloat_dsp-test: allow forcing cpuflags
James Almer [Fri, 10 Oct 2014 05:18:14 +0000 (02:18 -0300)]
float_dsp-test: allow forcing cpuflags

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/atrac3: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Fri, 10 Oct 2014 15:09:46 +0000 (17:09 +0200)]
avcodec/atrac3: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cavs: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Fri, 10 Oct 2014 15:09:46 +0000 (17:09 +0200)]
avcodec/cavs: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotcp: Add AVOption support
Luca Barbato [Thu, 9 Oct 2014 20:05:27 +0000 (22:05 +0200)]
tcp: Add AVOption support

5 years agotls: Support passing old-style tcp options
Luca Barbato [Thu, 9 Oct 2014 19:34:54 +0000 (21:34 +0200)]
tls: Support passing old-style tcp options

Make tcp and tls urls near-interchangeable.

5 years agortsp: Add rtsps to the probe
Luca Barbato [Thu, 9 Oct 2014 20:07:35 +0000 (22:07 +0200)]
rtsp: Add rtsps to the probe

5 years agortsp: Support tls when in listen mode
Luca Barbato [Thu, 9 Oct 2014 20:07:12 +0000 (22:07 +0200)]
rtsp: Support tls when in listen mode

5 years agortsp: Support tls-encapsulated RTSP
Luca Barbato [Thu, 9 Oct 2014 17:35:34 +0000 (19:35 +0200)]
rtsp: Support tls-encapsulated RTSP

5 years agortsp: Check for command strings without spaces
Luca Barbato [Thu, 9 Oct 2014 18:13:54 +0000 (20:13 +0200)]
rtsp: Check for command strings without spaces

Prevent a NULL-pointer dereference.

CC: libav-stable@libav.org
5 years agosctp: Use AVERROR_BUG instead of abort()
Luca Barbato [Thu, 9 Oct 2014 15:57:14 +0000 (17:57 +0200)]
sctp: Use AVERROR_BUG instead of abort()

Trying to write to a stream id larger the the maximum requested is
a programming error, still there is no reason to leave a
reachable abort() in the codebase.

CC: libav-stable@libav.org
5 years agolavf: More informative error message
Luca Barbato [Thu, 9 Oct 2014 15:18:03 +0000 (17:18 +0200)]
lavf: More informative error message

Print the timestamp values and not just the stream index.

5 years agolibavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LE
Rong Yan [Fri, 10 Oct 2014 08:29:58 +0000 (08:29 +0000)]
libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() sad16_xy2_altivec(...
Rong Yan [Fri, 10 Oct 2014 08:28:19 +0000 (08:28 +0000)]
libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: enable multi-thread decoding when refreshctx is equal to 0
Di Wu [Sat, 11 Oct 2014 17:20:18 +0000 (01:20 +0800)]
vp9: enable multi-thread decoding when refreshctx is equal to 0

In vp9_decode_frame function, ff_thread_finish_setup is not called
when refreshctx is equal to 0, and the next decoding thread can not
start work until the cunrrent frame has been decoded completely. So
ff_thread_finish_setup needs to be called to enable Multi-thread
decoding in this condition.

Signed-off-by: Di Wu <di1028.wu@samsung.com>
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agolibavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and pix_sum_altivec()...
Rong Yan [Fri, 10 Oct 2014 08:27:16 +0000 (08:27 +0000)]
libavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and pix_sum_altivec() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and diff_pixels_altivec(...
Rong Yan [Fri, 10 Oct 2014 08:25:44 +0000 (08:25 +0000)]
libavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and diff_pixels_altivec() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'
Michael Niedermayer [Fri, 10 Oct 2014 10:25:50 +0000 (12:25 +0200)]
Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'

* commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae':
  w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Conflicts:
compat/w32pthreads.h

See: 8c6992bf0cc24542a5ae245cd037a23638b76d75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11'
Michael Niedermayer [Fri, 10 Oct 2014 10:08:48 +0000 (12:08 +0200)]
Merge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11'

* commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11':
  w32pthreads: use the CONDITION_VARIABLE typedef if available

Conflicts:
compat/w32pthreads.h
configure

See: 0c0694931442ef9ea91eace120e0629e0ac01b76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agow32pthreads: use the condition variable API directly when targeting newer versions...
James Almer [Thu, 9 Oct 2014 16:13:06 +0000 (13:13 -0300)]
w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agow32pthreads: use the CONDITION_VARIABLE typedef if available
James Almer [Thu, 9 Oct 2014 16:13:05 +0000 (13:13 -0300)]
w32pthreads: use the CONDITION_VARIABLE typedef if available

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoffprobe: Simplify by using av_color_range_name()
Michael Niedermayer [Fri, 10 Oct 2014 02:24:05 +0000 (04:24 +0200)]
ffprobe: Simplify by using av_color_range_name()

Idea from: a2c00d22e71d13b72828147be86aa9e961c6cae6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/format: move mime_type_opt declaration to where its used
Michael Niedermayer [Fri, 10 Oct 2014 01:08:11 +0000 (03:08 +0200)]
avformat/format: move mime_type_opt declaration to where its used

also remove a related dead store

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/os_support: include unistd.h before defining lseek to lseek64 on android
Michael Niedermayer [Fri, 10 Oct 2014 00:30:39 +0000 (02:30 +0200)]
avformat/os_support: include unistd.h before defining lseek to lseek64 on android

fixes build failure

Found-by: James Almer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/error: Add AVERROR_INPUT_CHANGED & AVERROR_OUTPUT_CHANGED to error_entries[]
Michael Niedermayer [Thu, 9 Oct 2014 23:45:34 +0000 (01:45 +0200)]
avutil/error: Add AVERROR_INPUT_CHANGED & AVERROR_OUTPUT_CHANGED to error_entries[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/webm_dash: Allow filenames without directories
Vignesh Venkatasubramanian [Thu, 9 Oct 2014 21:56:47 +0000 (14:56 -0700)]
lavf/webm_dash: Allow filenames without directories

Fix basename computation code to allow just file names without any
directories in the path.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: dont leave swresampler in half initialized state
Marton Balint [Wed, 8 Oct 2014 21:36:11 +0000 (23:36 +0200)]
ffplay: dont leave swresampler in half initialized state

On init failure, let's just free it, so next time it will be recreated from
start.

Also fixes Coverity CID 1241515.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agocompat/w32pthreads: use the condition variable API directly when targeting newer...
James Almer [Thu, 9 Oct 2014 20:49:22 +0000 (17:49 -0300)]
compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoFix writing first audio Cues in dash mode.
Frank Galligan [Thu, 9 Oct 2014 15:28:00 +0000 (08:28 -0700)]
Fix writing first audio Cues in dash mode.

In dahsmode Matroska is not writing the first Cluster for every
audio stream in the Cues element.

Signed-off-by: Frank Galligan <frankgalligan@gmail.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>