ffmpeg.git
6 years agoMerge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'
Michael Niedermayer [Sat, 18 Oct 2014 13:42:29 +0000 (15:42 +0200)]
Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
  lavc: deprecate unused mb_threshold field

Conflicts:
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '685be3d1aecf965281128f3b631ed965bcfa754d'
Michael Niedermayer [Sat, 18 Oct 2014 13:33:57 +0000 (15:33 +0200)]
Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'

* commit '685be3d1aecf965281128f3b631ed965bcfa754d':
  libvpxenc: add static-thresh private option

Conflicts:
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
Michael Niedermayer [Sat, 18 Oct 2014 13:04:42 +0000 (15:04 +0200)]
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'
Michael Niedermayer [Sat, 18 Oct 2014 12:17:41 +0000 (14:17 +0200)]
Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'

* commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6':
  lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'
Michael Niedermayer [Sat, 18 Oct 2014 12:06:15 +0000 (14:06 +0200)]
Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'

* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
  lavc: make rc_eq into private options of mpegvideo encoders

Conflicts:
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'
Michael Niedermayer [Sat, 18 Oct 2014 11:51:59 +0000 (13:51 +0200)]
Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'

* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486':
  lavc: make rc_qmod_* into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
Michael Niedermayer [Sat, 18 Oct 2014 11:30:38 +0000 (13:30 +0200)]
Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'

* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf':
  lavc: make rc_qsquish a private option of mpegvideo encoders

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'
Michael Niedermayer [Sat, 18 Oct 2014 10:46:37 +0000 (12:46 +0200)]
Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'

* commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836':
  resample: Avoid off-by-1 errors in PTS calcs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate/mpeg4: add -sws_flags +bitexact
Michael Niedermayer [Sat, 18 Oct 2014 10:30:00 +0000 (12:30 +0200)]
tests/fate/mpeg4: add -sws_flags +bitexact

Should fix fate-mpeg4-resolution-change tests

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb238f8230c1b0314985482207add548c68f83cf'
Michael Niedermayer [Sat, 18 Oct 2014 10:15:50 +0000 (12:15 +0200)]
Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

* commit 'fb238f8230c1b0314985482207add548c68f83cf':
  urlprotocol: remove unused url_interrupt_cb declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: deprecate unused mb_threshold field
Anton Khirnov [Wed, 8 Oct 2014 10:58:43 +0000 (10:58 +0000)]
lavc: deprecate unused mb_threshold field

6 years agolibvpxenc: add static-thresh private option
Anton Khirnov [Wed, 8 Oct 2014 10:49:11 +0000 (10:49 +0000)]
libvpxenc: add static-thresh private option

Currently, this option is accessed through AVCodecContext.mb_threshold,
which originally controlled reusing MB data when transcoding mpeg to
mpeg. Since the libvpx meaning is completely different from the original
mpegvideo meaning, it is better to use a separate private option for
this.

6 years agolavc: deprecate unused me_threshold field
Anton Khirnov [Wed, 8 Oct 2014 10:39:02 +0000 (10:39 +0000)]
lavc: deprecate unused me_threshold field

6 years agolavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo...
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

6 years agolavc: make rc_eq into private options of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_eq into private options of mpegvideo encoders

6 years agolavc: make rc_qmod_* into private options of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_qmod_* into private options of mpegvideo encoders

6 years agolavc: make rc_qsquish a private option of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_qsquish a private option of mpegvideo encoders

6 years agoresample: Avoid off-by-1 errors in PTS calcs.
Timothy B. Terriberry [Tue, 14 Oct 2014 00:46:00 +0000 (17:46 -0700)]
resample: Avoid off-by-1 errors in PTS calcs.

The rounding used in the PTS calculations in filter_frame() does
not actually match the number of samples output by the resampler.
This leads to off-by-1 errors in the timestamps indicating gaps and
underruns, even when the input timestamps are all contiguous.

Bug-Id: 753

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agourlprotocol: remove unused url_interrupt_cb declaration
Anton Khirnov [Fri, 17 Oct 2014 13:18:52 +0000 (15:18 +0200)]
urlprotocol: remove unused url_interrupt_cb declaration

It is a remnant of the old interrupt callback API.

6 years agoMerge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
Michael Niedermayer [Sat, 18 Oct 2014 01:12:10 +0000 (03:12 +0200)]
Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'

* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
  rtmpproto: Add pause support

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'
Michael Niedermayer [Sat, 18 Oct 2014 01:01:31 +0000 (03:01 +0200)]
Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'

* commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467':
  rtmpproto: Track last received timestamp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: add pkg-config support for libx264
Benoit Fouet [Fri, 17 Oct 2014 14:35:58 +0000 (16:35 +0200)]
configure: add pkg-config support for libx264

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavutil: Add CAST128 symmetric block cipher
Supraja Meedinti [Fri, 17 Oct 2014 18:22:25 +0000 (23:52 +0530)]
libavutil: Add CAST128 symmetric block cipher

Only ECB mode is supported at the moment

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: update documentation
Marton Balint [Sat, 11 Oct 2014 11:54:42 +0000 (13:54 +0200)]
ffplay: update documentation

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: remove manual bug option handling code
Marton Balint [Fri, 10 Oct 2014 22:52:15 +0000 (00:52 +0200)]
ffplay: remove manual bug option handling code

It is supported as a codec option, and those are already parsed.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: remove delays when paused from video and subtitle thread
Marton Balint [Fri, 10 Oct 2014 21:57:26 +0000 (23:57 +0200)]
ffplay: remove delays when paused from video and subtitle thread

Once the frame queue is full, we will wait anyway.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agortmpproto: Add pause support
Uwe L. Korn [Fri, 17 Oct 2014 14:30:47 +0000 (16:30 +0200)]
rtmpproto: Add pause support

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmpproto: Track last received timestamp
Uwe L. Korn [Fri, 17 Oct 2014 14:30:46 +0000 (16:30 +0200)]
rtmpproto: Track last received timestamp

Some RTMP commands need the most recent timestamp as their parameter, so
keep track of it. This must be the most recent one and not e.g. the max
received timestamp as it can decrease again through seeking.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agohlsenc.c, segment.c: propagate defaults to mpegts
Mika Raento [Fri, 17 Oct 2014 16:28:47 +0000 (19:28 +0300)]
hlsenc.c, segment.c: propagate defaults to mpegts

This fixes the abnormally high ts overhead in the files produced by the
HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For
example makes it much more likely that it can produces streams that fit
under the 64kb App store limit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
Michael Niedermayer [Fri, 17 Oct 2014 19:00:08 +0000 (21:00 +0200)]
Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'

* commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4':
  dump: display codec tags when available

Conflicts:
libavcodec/utils.c

See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '66e9f839536238945fbfe9d2041b6891cb150e45'
Michael Niedermayer [Fri, 17 Oct 2014 18:45:43 +0000 (20:45 +0200)]
Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'

* commit '66e9f839536238945fbfe9d2041b6891cb150e45':
  libfdk-aacdec: Enable Dynamic Range Control Metadata Support

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libfdk-aacdec: use av_feeep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 17 Oct 2014 18:36:14 +0000 (20:36 +0200)]
avcodec/libfdk-aacdec: use av_feeep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'
Michael Niedermayer [Fri, 17 Oct 2014 18:35:43 +0000 (20:35 +0200)]
Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'

* commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93':
  libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/id3v2: support buggy id3v2.3 tag length in id3v2.4
Benoit Fouet [Fri, 17 Oct 2014 08:56:59 +0000 (10:56 +0200)]
avformat/id3v2: support buggy id3v2.3 tag length in id3v2.4

Some encoders do not use syncsafe sizes in v2.4 id3 tags. Check the next
tag to try to choose between the two.

Fixes ticket #4003

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogitignore: add test_copy.ffmeta
Benoit Fouet [Fri, 17 Oct 2014 09:50:53 +0000 (11:50 +0200)]
gitignore: add test_copy.ffmeta

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodump: display codec tags when available
Vittorio Giovara [Fri, 17 Oct 2014 10:31:46 +0000 (11:31 +0100)]
dump: display codec tags when available

For both audio and video.

6 years agoMerge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
Michael Niedermayer [Fri, 17 Oct 2014 13:34:24 +0000 (15:34 +0200)]
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'

* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
  rtmpproto: Add getStreamLength call to query duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '324b23dde1bc8638959eb32419c95a93906db272'
Michael Niedermayer [Fri, 17 Oct 2014 13:21:26 +0000 (15:21 +0200)]
Merge commit '324b23dde1bc8638959eb32419c95a93906db272'

* commit '324b23dde1bc8638959eb32419c95a93906db272':
  rtmpproto: Add function to read a number response

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'
Michael Niedermayer [Fri, 17 Oct 2014 12:57:00 +0000 (14:57 +0200)]
Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
  cmdutils: Use the correct guard

Conflicts:
cmdutils.c

See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibfdk-aacdec: Enable Dynamic Range Control Metadata Support
Omer Osman [Tue, 14 Oct 2014 14:43:08 +0000 (16:43 +0200)]
libfdk-aacdec: Enable Dynamic Range Control Metadata Support

For streams which contain DRC metadata, the FDK decoder is able to
control rendering of the decoded output. The rendering parameters
are detailed in fdk_aac_dec_options [].

The default behavior is left up to the decoder.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support
Omer Osman [Tue, 14 Oct 2014 14:43:07 +0000 (16:43 +0200)]
libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

The FDK decoder is capable of producing mono and stereo downmix from
multichannel streams. These streams may contain metadata that control
the downmix process. The decoder requires an Ancillary Buffer in order to
correctly apply downmix in streams containing downmix Metadata. The
decoder does not have an API interface to inform of the presence of
Metadata in the stream, and therefore the Ancillary Buffer is always
allocated whenever a downmix is requested.

When downmixing multichannel streams, the decoder requires the output
buffer in aacDecoder_DecodeFrame call to be of fixed size in order to
hold the actual number of channels contained in the stream. For example,
for a 5.1ch to stereo downmix, the decoder requires that the output buffer
is allocated for 6 channels, regardless of the fact that the output is in
fact two channels.

Due to this requirement, the output buffer is allocated for the maximum
output buffer size in case a downmix is requested (and also during
decoder init). When a downmix is requested, the buffer used for output
during init will also be used for the entire duration the decoder is open.
Otherwise, the initial decoder output buffer is freed and the decoder
decodes straight into the output AVFrame.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'
Michael Niedermayer [Fri, 17 Oct 2014 12:21:25 +0000 (14:21 +0200)]
Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

* commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee':
  avformat: Make avformat_free_context handle NULL

See: ee23dcf534801931c13f9f534586b56e231d3085
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
Michael Niedermayer [Fri, 17 Oct 2014 12:08:40 +0000 (14:08 +0200)]
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'

* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
ffmpeg.c

See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
Michael Niedermayer [Fri, 17 Oct 2014 11:47:49 +0000 (13:47 +0200)]
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
  avconv: fix leak in filter error

Conflicts:
ffmpeg_filter.c

See: 14369f59c5ad1fb817fb4d94073f31cccf12b556
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
Michael Niedermayer [Fri, 17 Oct 2014 11:35:27 +0000 (13:35 +0200)]
Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'

* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
  avprobe: Remove a pointless check

Conflicts:
avprobe.c

No change as the code does not exist in ffprobe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'
Michael Niedermayer [Fri, 17 Oct 2014 11:28:50 +0000 (13:28 +0200)]
Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
Michael Niedermayer [Fri, 17 Oct 2014 11:17:05 +0000 (13:17 +0200)]
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate/mpeg4: fix samples path
Michael Niedermayer [Fri, 17 Oct 2014 11:07:55 +0000 (13:07 +0200)]
tests/fate/mpeg4: fix samples path

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'
Michael Niedermayer [Fri, 17 Oct 2014 10:52:15 +0000 (12:52 +0200)]
Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'

* commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48':
  fate: add mpeg4 tests for frame size changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/m4vdec: mark as possibly containing discontinuities
Michael Niedermayer [Fri, 17 Oct 2014 10:37:40 +0000 (12:37 +0200)]
avformat/m4vdec: mark as possibly containing discontinuities

This will be needed for the resolution change mpeg4 test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: Add getStreamLength call to query duration
Uwe L. Korn [Tue, 14 Oct 2014 15:16:21 +0000 (17:16 +0200)]
rtmpproto: Add getStreamLength call to query duration

In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmpproto: Add function to read a number response
Uwe L. Korn [Tue, 14 Oct 2014 15:16:20 +0000 (17:16 +0200)]
rtmpproto: Add function to read a number response

Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocmdutils: Use the correct guard
Luca Barbato [Wed, 15 Oct 2014 00:43:30 +0000 (02:43 +0200)]
cmdutils: Use the correct guard

The OptionDef arrays are terminated with a { NULL } element not NULL.

CC: libav-stable@libav.org
Bug-Id: CID 703769

6 years agoavformat: Make avformat_free_context handle NULL
Luca Barbato [Wed, 15 Oct 2014 00:35:55 +0000 (02:35 +0200)]
avformat: Make avformat_free_context handle NULL

Work as the other free()-like functions.

Bug-Id: CID 1087081
CC: libav-stable@libav.org
6 years agoavconv: check return value
Vittorio Giovara [Tue, 14 Oct 2014 15:46:48 +0000 (16:46 +0100)]
avconv: check return value

CC: libav-stable@libav.org
Bug-Id: CID 1224275

6 years agoavconv: fix leak in filter error
Vittorio Giovara [Tue, 14 Oct 2014 15:46:44 +0000 (16:46 +0100)]
avconv: fix leak in filter error

CC: libav-stable@libav.org
Bug-Id: CID 1005311

6 years agoavprobe: Remove a pointless check
Luca Barbato [Tue, 14 Oct 2014 15:46:42 +0000 (16:46 +0100)]
avprobe: Remove a pointless check

The element is always valid.

CC: libav-stable@libav.org
Bug-Id: CID 732276

6 years agoavplay: Always free opts
Luca Barbato [Tue, 14 Oct 2014 15:46:39 +0000 (16:46 +0100)]
avplay: Always free opts

CC: libav-stable@libav.org
Bug-Id: CID 733793

6 years agoavplay: Always free find_stream_info options
Luca Barbato [Tue, 14 Oct 2014 15:46:38 +0000 (16:46 +0100)]
avplay: Always free find_stream_info options

CC: libav-stable@libav.org
Bug-Id: CID 1238794

6 years agofate: add mpeg4 tests for frame size changes
Janne Grunau [Tue, 18 Sep 2012 14:03:08 +0000 (16:03 +0200)]
fate: add mpeg4 tests for frame size changes

6 years agodoc/filters.texi: fix several typos in the vidstab* sections
Moritz Barsnick [Wed, 15 Oct 2014 13:44:33 +0000 (15:44 +0200)]
doc/filters.texi: fix several typos in the vidstab* sections

Also create an anchor for the unsharp filter, and references to
it in its mentions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vf_noise: move asm code to a separate file
James Almer [Fri, 17 Oct 2014 01:24:42 +0000 (22:24 -0300)]
x86/vf_noise: move asm code to a separate file

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoswresample/resample: fix invert_initial_buffer() after flush
Michael Niedermayer [Thu, 16 Oct 2014 19:18:15 +0000 (21:18 +0200)]
swresample/resample: fix invert_initial_buffer() after flush

Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample: do not put multiple statements in one line
Michael Niedermayer [Thu, 16 Oct 2014 16:18:40 +0000 (18:18 +0200)]
swresample: do not put multiple statements in one line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/id3v2: silence a warning when CONFIG_ZLIB is unset.
Benoit Fouet [Thu, 16 Oct 2014 09:44:46 +0000 (11:44 +0200)]
avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.

dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_noise: Use a separate seed for each plane
Michael Niedermayer [Thu, 16 Oct 2014 13:05:17 +0000 (15:05 +0200)]
avfilter/vf_noise: Use a separate seed for each plane

This should reduce the correlation between planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_noise: use per component rand_shift
Michael Niedermayer [Thu, 16 Oct 2014 12:51:04 +0000 (14:51 +0200)]
avfilter/vf_noise: use per component rand_shift

This allows using different shifts per plane

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_noise: move shift calculation to filter_frame()
Michael Niedermayer [Thu, 16 Oct 2014 12:28:47 +0000 (14:28 +0200)]
avfilter/vf_noise: move shift calculation to filter_frame()

This makes the temporal noise case deterministic with threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_noise: fix high resolution support
Michael Niedermayer [Thu, 16 Oct 2014 11:23:39 +0000 (13:23 +0200)]
avfilter/vf_noise: fix high resolution support

Fixes Ticket4017
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '979932378ae3fbf452e312eb759cc7ce175f78de'
Michael Niedermayer [Thu, 16 Oct 2014 10:38:59 +0000 (12:38 +0200)]
Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
  ismindex: use tfhd default duration if no sample duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'
Michael Niedermayer [Thu, 16 Oct 2014 10:28:00 +0000 (12:28 +0200)]
Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'

* commit '460b509a34fb5fad3bedac8429f53594d3923ea8':
  rtsp: Check a memory allocation

See: c69f230a3afbfa30d7a978a6961b1ddcc774499f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix initialisers in dct-test.c.
Carl Eugen Hoyos [Thu, 16 Oct 2014 10:01:26 +0000 (12:01 +0200)]
Fix initialisers in dct-test.c.

Silences a warning when running fate on unusual platforms:
libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]

6 years agoismindex: use tfhd default duration if no sample duration
Mika Raento [Thu, 16 Oct 2014 05:55:17 +0000 (08:55 +0300)]
ismindex: use tfhd default duration if no sample duration

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Check a memory allocation
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
rtsp: Check a memory allocation

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompegts: add the judgement if a new program is created successfully
Di Wu [Wed, 15 Oct 2014 08:24:21 +0000 (16:24 +0800)]
mpegts: add the judgement if a new program is created successfully

Add the judement after create a new program to avoid segment fault.

Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
Michael Niedermayer [Wed, 15 Oct 2014 23:53:43 +0000 (01:53 +0200)]
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration(...
Michael Niedermayer [Wed, 15 Oct 2014 23:48:41 +0000 (01:48 +0200)]
avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case

No testcase where this makes a difference is known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/oggparsedirac: use AVCodecContext.framerate
Michael Niedermayer [Wed, 15 Oct 2014 22:29:14 +0000 (00:29 +0200)]
avformat/oggparsedirac: use AVCodecContext.framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/avcodec: more verbose documentation for time_base
Michael Niedermayer [Wed, 15 Oct 2014 22:13:45 +0000 (00:13 +0200)]
avcodec/avcodec: more verbose documentation for time_base

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/avcodec: fix non doxy comment
Michael Niedermayer [Wed, 15 Oct 2014 22:10:38 +0000 (00:10 +0200)]
avcodec/avcodec: fix non doxy comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'
Michael Niedermayer [Wed, 15 Oct 2014 22:02:50 +0000 (00:02 +0200)]
Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'

* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
  rtmpproto: Fix a typo

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

* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
  rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
Michael Niedermayer [Wed, 15 Oct 2014 20:03:02 +0000 (22:03 +0200)]
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'

* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
  rtpdec_hevc: Rename a variable for clarity

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '74b02377980321934e33969c84733ace7e9f4eeb'
Michael Niedermayer [Wed, 15 Oct 2014 19:39:50 +0000 (21:39 +0200)]
Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'

* commit '74b02377980321934e33969c84733ace7e9f4eeb':
  mov: Correctly check the color transfer characteristics range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'
Michael Niedermayer [Wed, 15 Oct 2014 19:22:06 +0000 (21:22 +0200)]
Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'

* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
  imc: fix order of operations in coefficients read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: auodetect "use_mfra_for"
Michael Niedermayer [Mon, 13 Oct 2014 11:35:33 +0000 (13:35 +0200)]
avformat/mov: auodetect "use_mfra_for"

Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: mov_muxer requires ac3_parser
Yu Xiaolei [Wed, 15 Oct 2014 05:33:39 +0000 (13:33 +0800)]
build: mov_muxer requires ac3_parser

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rtsp: check memory allocation
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
avformat/rtsp: check memory allocation

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: Fix a typo
Martin Storsjö [Wed, 15 Oct 2014 10:41:33 +0000 (13:41 +0300)]
rtmpproto: Fix a typo

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Martin Storsjö [Wed, 15 Oct 2014 13:21:27 +0000 (16:21 +0300)]
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec_hevc: Rename a variable for clarity
Martin Storsjö [Wed, 15 Oct 2014 13:14:28 +0000 (16:14 +0300)]
rtpdec_hevc: Rename a variable for clarity

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc/encoders: add basic libx265 documentation
Lou Logan [Thu, 2 Oct 2014 23:05:08 +0000 (15:05 -0800)]
doc/encoders: add basic libx265 documentation

Fixes ticket #3944.

Signed-off-by: Lou Logan <lou@lrcd.com>
6 years agoavcodec/ass: add FFmpeg signature
Clément Bœsch [Sat, 11 Oct 2014 16:37:43 +0000 (18:37 +0200)]
avcodec/ass: add FFmpeg signature

6 years agoavformat/assdec: typo fix
Clément Bœsch [Sat, 11 Oct 2014 18:14:37 +0000 (20:14 +0200)]
avformat/assdec: typo fix

6 years agoavcodec/ass_split: realign after addition of new fields
Clément Bœsch [Sat, 11 Oct 2014 18:16:43 +0000 (20:16 +0200)]
avcodec/ass_split: realign after addition of new fields

6 years agoavcodec/ass_split: assume default order when "Format:" line is not found
Clément Bœsch [Sat, 11 Oct 2014 14:12:51 +0000 (16:12 +0200)]
avcodec/ass_split: assume default order when "Format:" line is not found

Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.

6 years agoavcodec/ass_split: extend recognized fields in ASS splitter
Clément Bœsch [Sat, 11 Oct 2014 14:10:51 +0000 (16:10 +0200)]
avcodec/ass_split: extend recognized fields in ASS splitter

This simplifies the logic for the fix in the next commit.

6 years agoavcodec/ass: output missing fields in AVSubtitles and output files
Clément Bœsch [Sat, 11 Oct 2014 12:31:23 +0000 (14:31 +0200)]
avcodec/ass: output missing fields in AVSubtitles and output files

Fixes Ticket #3207

6 years agoavformat/assenc: support remuxing old V4 ASS form (SSA)
Clément Bœsch [Sat, 11 Oct 2014 10:57:37 +0000 (12:57 +0200)]
avformat/assenc: support remuxing old V4 ASS form (SSA)

6 years agofate: fix some subtitles tests dependencies
Clément Bœsch [Sat, 11 Oct 2014 12:05:49 +0000 (14:05 +0200)]
fate: fix some subtitles tests dependencies