ffmpeg.git
5 years agoMerge commit '1688eef25385089026aba55da1885f70a57815ab'
Michael Niedermayer [Wed, 27 Aug 2014 10:38:53 +0000 (12:38 +0200)]
Merge commit '1688eef25385089026aba55da1885f70a57815ab'

* commit '1688eef25385089026aba55da1885f70a57815ab':
  avconv: fix the muxrate values for -target

Conflicts:
ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'
Michael Niedermayer [Wed, 27 Aug 2014 10:00:10 +0000 (12:00 +0200)]
Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'

* commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de':
  mpegenc: limit the maximum muxrate

Conflicts:
libavformat/mpegenc.c

See: 28d35dbe9f570025c220c08997bc11e21b3c1a66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavconv: fix the muxrate values for -target
Anton Khirnov [Mon, 25 Aug 2014 21:24:35 +0000 (21:24 +0000)]
avconv: fix the muxrate values for -target

The mpegenc private option values are in 50-byte units.

CC: libav-stable@libav.org
5 years agompegenc: limit the maximum muxrate
Anton Khirnov [Mon, 25 Aug 2014 21:21:57 +0000 (21:21 +0000)]
mpegenc: limit the maximum muxrate

It is written to the file as a 22-bit value.

CC: libav-stable@libav.org
5 years agoavformat/mxfenc: dont warn about d10_channelcount being ignored if its not set
Michael Niedermayer [Fri, 22 Aug 2014 20:36:55 +0000 (22:36 +0200)]
avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'
Michael Niedermayer [Tue, 26 Aug 2014 20:01:45 +0000 (22:01 +0200)]
Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'

* commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0':
  h264: fully check cropping amount from sps

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
Michael Niedermayer [Tue, 26 Aug 2014 19:45:39 +0000 (21:45 +0200)]
Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'

* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
  libxvid: K&R formatting cosmetics

Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
Michael Niedermayer [Tue, 26 Aug 2014 18:48:07 +0000 (20:48 +0200)]
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'

* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
  doc: fix a typo

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'
Michael Niedermayer [Tue, 26 Aug 2014 18:40:34 +0000 (20:40 +0200)]
Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'

* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
  os_support: Adjust an outdated #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec_h261: Fix sanity checks
ThomasVolkert [Tue, 26 Aug 2014 12:23:00 +0000 (14:23 +0200)]
avformat/rtpdec_h261: Fix sanity checks

Fixes mbap and quant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx264: fix -b_qfactor and -chromaoffset
Hii [Tue, 26 Aug 2014 06:55:14 +0000 (14:55 +0800)]
libx264: fix -b_qfactor and -chromaoffset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: fully check cropping amount from sps
Vittorio Giovara [Tue, 26 Aug 2014 00:40:19 +0000 (20:40 -0400)]
h264: fully check cropping amount from sps

Even if sps.crop is true, the cropping amount may be zero.
Fixes a sample with a valid but broken container cropping.

5 years agolibxvid: K&R formatting cosmetics
Gabriel Dume [Wed, 20 Aug 2014 21:25:21 +0000 (17:25 -0400)]
libxvid: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agodoc: fix a typo
Gabriel Dume [Mon, 25 Aug 2014 19:28:02 +0000 (15:28 -0400)]
doc: fix a typo

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoos_support: Adjust an outdated #endif comment
Diego Biurrun [Fri, 15 Aug 2014 07:46:03 +0000 (09:46 +0200)]
os_support: Adjust an outdated #endif comment

5 years agoavformat/utils: remove assert that tests the same condition as the if() directly...
Michael Niedermayer [Tue, 26 Aug 2014 13:23:23 +0000 (15:23 +0200)]
avformat/utils: remove assert that tests the same condition as the if() directly above

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nsvdec: fix out-commented asserts so the function names exist
Michael Niedermayer [Tue, 26 Aug 2014 13:21:25 +0000 (15:21 +0200)]
avformat/nsvdec: fix out-commented asserts so the function names exist

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: remove out-commented assert
Michael Niedermayer [Tue, 26 Aug 2014 13:20:58 +0000 (15:20 +0200)]
avcodec/snowenc: remove out-commented assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'
Michael Niedermayer [Tue, 26 Aug 2014 12:04:39 +0000 (14:04 +0200)]
Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'

* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
  mpeg: Write H264 streams at offset 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'
Michael Niedermayer [Tue, 26 Aug 2014 10:40:32 +0000 (12:40 +0200)]
Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'

* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
  vc1: Fix the skip condition

Conflicts:
libavcodec/vc1_parser.c

See: ede411dd03950b91c6346f2a3ae0e7546555f42f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'
Michael Niedermayer [Tue, 26 Aug 2014 10:05:20 +0000 (12:05 +0200)]
Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'

* commit 'ab56fabe6294524e99815451ad01e4ff50c6d734':
  vfwcap: Add fallback define for HWND_MESSAGE

The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
    commit 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2
        vfwcap: Drop fallback VfW defines
        The defines were added long ago when MinGW still lacked them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: update libvpx_vp9_encoder check
James Almer [Tue, 26 Aug 2014 03:24:39 +0000 (00:24 -0300)]
configure: update libvpx_vp9_encoder check

Required to add support for the aq_mode setting.
Any libvpx snapshot prior to 1.3.0 is not recommended for vp9 encoding for that matter.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agompeg: Write H264 streams at offset 2
Luca Barbato [Fri, 8 Aug 2014 11:05:12 +0000 (13:05 +0200)]
mpeg: Write H264 streams at offset 2

It hints that the content is H264 according to HD-DVD.

5 years agovc1: Fix the skip condition
Luca Barbato [Sun, 24 Aug 2014 17:34:13 +0000 (19:34 +0200)]
vc1: Fix the skip condition

As written in the comment above, skip must be added only if a
start code is found.

5 years agoavformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing
ThomasVolkert [Mon, 25 Aug 2014 22:51:59 +0000 (00:51 +0200)]
avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing

5 years agovfwcap: Add fallback define for HWND_MESSAGE
Diego Biurrun [Mon, 25 Aug 2014 15:26:15 +0000 (17:26 +0200)]
vfwcap: Add fallback define for HWND_MESSAGE

Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.

5 years agodoc/snow: remove possibly wrong todo item
Michael Niedermayer [Mon, 25 Aug 2014 22:27:28 +0000 (00:27 +0200)]
doc/snow: remove possibly wrong todo item

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: use av_malloc_array()
Michael Niedermayer [Mon, 25 Aug 2014 16:32:53 +0000 (18:32 +0200)]
ffplay: use av_malloc_array()

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/ftp: Do not leak memory in routine ftp_features
Alexander Strasser [Tue, 19 Aug 2014 22:41:55 +0000 (00:41 +0200)]
libavformat/ftp: Do not leak memory in routine ftp_features

Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.

Should fix CID1231988 (RESOURCE_LEAK)

OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
5 years agohuffyuvdec: decode the last odd sample
Christophe Gisquet [Mon, 25 Aug 2014 20:24:30 +0000 (20:24 +0000)]
huffyuvdec: decode the last odd sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohuffyuvenc: write last odd sample
Christophe Gisquet [Mon, 25 Aug 2014 20:24:29 +0000 (20:24 +0000)]
huffyuvenc: write last odd sample

If width is odd, last sample wouldn't be written.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp9: Use av_malloc_array()
Michael Niedermayer [Mon, 25 Aug 2014 16:33:11 +0000 (18:33 +0200)]
avcodec/vp9: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroskadec: Ensure cues_end is initialized
Vignesh Venkatasubramanian [Mon, 25 Aug 2014 16:15:13 +0000 (09:15 -0700)]
lavf/matroskadec: Ensure cues_end is initialized

Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.

This fixes coverity defect CID1231991.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opencl: use av_malloc(z)_array()
Michael Niedermayer [Mon, 25 Aug 2014 14:06:10 +0000 (16:06 +0200)]
avutil/opencl: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vorbisenc: use av_malloc(z)_array()
Michael Niedermayer [Mon, 25 Aug 2014 14:03:54 +0000 (16:03 +0200)]
avcodec/vorbisenc: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in dates and hashes
Michael Niedermayer [Mon, 25 Aug 2014 13:57:37 +0000 (15:57 +0200)]
doc/APIchanges: fill in dates and hashes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2
Michael Niedermayer [Wed, 20 Aug 2014 18:01:40 +0000 (20:01 +0200)]
avcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2

Fixes bitrate detection in CBR mpeg2
Fixes ticket3678

5 years agoMerge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'
Michael Niedermayer [Mon, 25 Aug 2014 11:26:42 +0000 (13:26 +0200)]
Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'

* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
  libavformat: use MSG_NOSIGNAL when applicable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
Michael Niedermayer [Mon, 25 Aug 2014 10:27:19 +0000 (12:27 +0200)]
Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'

* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
  lavf: add AVFormatContext.max_ts_probe

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h

lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'
Michael Niedermayer [Mon, 25 Aug 2014 10:09:29 +0000 (12:09 +0200)]
Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'

* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat: use MSG_NOSIGNAL when applicable
Rémi Denis-Courmont [Wed, 20 Aug 2014 20:06:07 +0000 (23:06 +0300)]
libavformat: use MSG_NOSIGNAL when applicable

If the remote end of a connection oriented socket hangs up, generating
an EPIPE error is preferable over an unhandled SIGPIPE signal.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavf: add AVFormatContext.max_ts_probe
Anton Khirnov [Tue, 19 Aug 2014 17:49:58 +0000 (17:49 +0000)]
lavf: add AVFormatContext.max_ts_probe

It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.

5 years agodoc/APIchanges: fill in missing hashes and dates
Anton Khirnov [Sun, 18 May 2014 08:52:41 +0000 (10:52 +0200)]
doc/APIchanges: fill in missing hashes and dates

5 years agoRevert "pnmenc: use bits_per_raw_sample"
Michael Niedermayer [Mon, 25 Aug 2014 00:59:17 +0000 (02:59 +0200)]
Revert "pnmenc: use bits_per_raw_sample"

This reverts commit 1506ea947d3c527f67a5caa93cc7fa0d064bbf1f.

Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"

5 years agoavcodec/vc1dec: fix null pointer dereference
Michael Niedermayer [Mon, 25 Aug 2014 00:17:32 +0000 (02:17 +0200)]
avcodec/vc1dec: fix null pointer dereference

Fixes Ticket3860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver: tests, use Metadata title in config
Reynaldo H. Verdejo Pinochet [Fri, 22 Aug 2014 22:29:18 +0000 (18:29 -0400)]
ffserver: tests, use Metadata title in config

'Title' was deprecated with 9985710a5a927d52c345c4bdcc88f5c014ee2fe7

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: tests, use new port/bindaddress config
Reynaldo H. Verdejo Pinochet [Wed, 20 Aug 2014 04:49:38 +0000 (00:49 -0400)]
ffserver: tests, use new port/bindaddress config

Comming from commit 1013d8dd6967f1e776c08dc133ed6ae44ca3dc64
the old Port and BindAddress config vars have been deprecated
in favor of HTTPPort and HTTPBindAddress respectively.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoavcodec/utils: add GBRP16 to avcodec_align_dimensions2()
Michael Niedermayer [Sun, 24 Aug 2014 21:33:40 +0000 (23:33 +0200)]
avcodec/utils: add GBRP16 to avcodec_align_dimensions2()

Fixes Ticket3869

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'
Michael Niedermayer [Sun, 24 Aug 2014 19:01:29 +0000 (21:01 +0200)]
Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'

* commit '424b929b5cb9ca4094099f25179829260d4b0fa3':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
libavdevice/pulse_audio_dec.c

wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskaenc: Check alpha_mode
Michael Niedermayer [Wed, 20 Aug 2014 16:40:20 +0000 (18:40 +0200)]
avformat/matroskaenc: Check alpha_mode

Fixes CID1231992

Suggested-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/h264_slice: Add a missing newline to an error message.
Carl Eugen Hoyos [Sun, 24 Aug 2014 13:33:10 +0000 (15:33 +0200)]
lavc/h264_slice: Add a missing newline to an error message.

5 years agoMerge remote-tracking branch 'ubitux/codecview'
Michael Niedermayer [Sun, 24 Aug 2014 12:53:31 +0000 (14:53 +0200)]
Merge remote-tracking branch 'ubitux/codecview'

* ubitux/codecview:
  avfilter: add codecview filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: add codecview filter
Clément Bœsch [Mon, 18 Aug 2014 14:32:26 +0000 (16:32 +0200)]
avfilter: add codecview filter

5 years agopulse: Add a wallclock option to be compatible with other other captures
Luca Barbato [Sat, 23 Aug 2014 17:03:21 +0000 (19:03 +0200)]
pulse: Add a wallclock option to be compatible with other other captures

alsa and x11grab use av_gettime() to report timestamps.

Bug-Id: 647

5 years agoCorrect few "ffmpeg" typos
Paul B Mahol [Sat, 23 Aug 2014 19:39:22 +0000 (19:39 +0000)]
Correct few "ffmpeg" typos

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/xan: fix style issue
Paul B Mahol [Sat, 23 Aug 2014 19:22:13 +0000 (19:22 +0000)]
avcodec/xan: fix style issue

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agox86: hevc_mc: split differently calls
Christophe Gisquet [Sun, 24 Aug 2014 08:46:30 +0000 (08:46 +0000)]
x86: hevc_mc: split differently calls

In some cases, 2 or 3 calls are performed to functions for unusual
widths. Instead, perform 2 calls for different widths to split the
workload.

The 8+16 and 4+8 widths for respectively 8 and more than 8 bits can't
be processed that way without modifications: some calls use unaligned
buffers, and having branches to handle this was resulting in no
micro-benchmark benefit.

For block_w == 12 (around 1% of the pixels of the sequence):
Before:
12758 decicycles in epel_uni, 4093 runs, 3 skips
19389 decicycles in qpel_uni, 8187 runs, 5 skips
22699 decicycles in epel_bi, 32743 runs, 25 skips
34736 decicycles in qpel_bi, 32733 runs, 35 skips

After:
11929 decicycles in epel_uni, 4096 runs, 0 skips
18131 decicycles in qpel_uni, 8184 runs, 8 skips
20065 decicycles in epel_bi, 32750 runs, 18 skips
31458 decicycles in qpel_bi, 32753 runs, 15 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hevc_mc: correct unneeded use of SSE4 code
Christophe Gisquet [Sun, 24 Aug 2014 08:46:31 +0000 (08:46 +0000)]
x86: hevc_mc: correct unneeded use of SSE4 code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopnmenc: use bits_per_raw_sample
Christophe Gisquet [Wed, 20 Aug 2014 08:10:45 +0000 (08:10 +0000)]
pnmenc: use bits_per_raw_sample

This allows writing actual bitdepth in RGB48 when it isn't actually 16.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add "H.261 RTP payload format (RFC 4587)"
Michael Niedermayer [Sun, 24 Aug 2014 02:11:37 +0000 (04:11 +0200)]
Changelog: add "H.261 RTP payload format (RFC 4587)"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 24 Aug 2014 01:58:11 +0000 (03:58 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  fate: Fix ffprobe tests with --target-path set.
  doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
  Do not print a useless error number if mov header reading fails.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd support for H.261 RTP payload format (RFC 4587)
ThomasVolkert [Sat, 23 Aug 2014 19:25:39 +0000 (21:25 +0200)]
Add support for H.261 RTP payload format (RFC 4587)

5 years agofate: Fix ffprobe tests with --target-path set.
Carl Eugen Hoyos [Sat, 16 Aug 2014 10:19:05 +0000 (12:19 +0200)]
fate: Fix ffprobe tests with --target-path set.

5 years agodoc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Carl Eugen Hoyos [Sun, 24 Aug 2014 00:49:06 +0000 (02:49 +0200)]
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.

5 years agoDo not print a useless error number if mov header reading fails.
Carl Eugen Hoyos [Sun, 24 Aug 2014 00:45:58 +0000 (02:45 +0200)]
Do not print a useless error number if mov header reading fails.

The error string is printed by ffmpeg as for other demuxers.

5 years agoavcodec/tiff: Make pixel format checks tighter
Michael Niedermayer [Sat, 23 Aug 2014 23:54:45 +0000 (01:54 +0200)]
avcodec/tiff: Make pixel format checks tighter

Fixes assertion failure with imgsrc001-lzma.tiff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/tiff: add support for LZMA compression
James Almer [Sat, 23 Aug 2014 02:39:57 +0000 (23:39 -0300)]
lavc/tiff: add support for LZMA compression

Derived from deflate code.
Requires liblzma.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '749b1f1359b5af0a08221923b016551b18ab6171'
Michael Niedermayer [Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)]
Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'

* commit '749b1f1359b5af0a08221923b016551b18ab6171':
  configure: add --enable-rpath

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5caf039ba2b4be067568a30146f29008d8db28d0'
Michael Niedermayer [Sat, 23 Aug 2014 20:08:15 +0000 (22:08 +0200)]
Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'

* commit '5caf039ba2b4be067568a30146f29008d8db28d0':
  Prepare for 11_beta2 Release

Conflicts:
RELEASE

Not merged as theres no FFmpeg 11_beta2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'
Michael Niedermayer [Sat, 23 Aug 2014 19:39:14 +0000 (21:39 +0200)]
Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'

* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
  ogg: Use separate classes for the aliases

Conflicts:
libavformat/oggenc.c

See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixelutils: faster pixelutils_sad_16x16
Clément Bœsch [Sat, 23 Aug 2014 18:03:10 +0000 (20:03 +0200)]
avutil/pixelutils: faster pixelutils_sad_16x16

501 to 439 decicycles.

See 45c7f3997ea11c3d1007b2126b1c0049a8c27105.

5 years agoconfigure: add --enable-rpath
Reinhard Tartler [Sat, 23 Aug 2014 14:04:26 +0000 (10:04 -0400)]
configure: add --enable-rpath

This option facilitates testing shared libarary builds: for instance
fate builders do no longer need to set LD_LIBRARY_PATH as the binaries will
get the right search paths hardcoded into their executable file.

This option is only meant to be used for testing purposes: The installed
libraries must not move around in the file system, and doing so will
cause a lot of subtle problems. For more information why using RPATH is
dangerous, please refer to

https://blog.flameeyes.eu/2010/06/the-why-and-how-of-rpath

5 years agoPrepare for 11_beta2 Release
Reinhard Tartler [Sat, 23 Aug 2014 14:12:16 +0000 (10:12 -0400)]
Prepare for 11_beta2 Release

5 years agodoc/filters: fix Shwo/Show typo
Clément Bœsch [Sat, 23 Aug 2014 14:07:55 +0000 (16:07 +0200)]
doc/filters: fix Shwo/Show typo

5 years agodict.c: Free non-strduped av_dict_set arguments on error.
Reimar Döffinger [Tue, 29 Jul 2014 19:16:35 +0000 (21:16 +0200)]
dict.c: Free non-strduped av_dict_set arguments on error.

Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavutil/pixelutils: faster pixelutils_sad_[au]_16x16
Clément Bœsch [Thu, 14 Aug 2014 20:30:55 +0000 (22:30 +0200)]
avutil/pixelutils: faster pixelutils_sad_[au]_16x16

~560 → ~500 decicycles

This is following the comments from Michael in
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-August/160599.html

Using 2 registers for accumulator didn't help. On the other hand,
some re-ordering between the movs and psadbw allowed going ~538 to ~500.

5 years agoavfilter/showcqt: add fontcolor option
Muhammad Faiz [Sat, 23 Aug 2014 08:01:22 +0000 (10:01 +0200)]
avfilter/showcqt: add fontcolor option

5 years agoavcodec/h264_slice: More complete cleanup in h264_slice_header_init()
Michael Niedermayer [Thu, 21 Aug 2014 14:33:03 +0000 (16:33 +0200)]
avcodec/h264_slice: More complete cleanup in h264_slice_header_init()

Fixes null pointer dereference
Fixes Ticket3873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails
Michael Niedermayer [Thu, 21 Aug 2014 14:15:16 +0000 (16:15 +0200)]
avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoogg: Use separate classes for the aliases
Luca Barbato [Sat, 23 Aug 2014 00:42:18 +0000 (02:42 +0200)]
ogg: Use separate classes for the aliases

Unbreak 051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd

5 years agoavcodec/imc: Fix bitstream buffer padding
Michael Niedermayer [Fri, 22 Aug 2014 23:34:28 +0000 (01:34 +0200)]
avcodec/imc: Fix bitstream buffer padding

Fixes buffer overread

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: do not return on sidedata allocation failure
Christophe Gisquet [Fri, 22 Aug 2014 14:49:54 +0000 (16:49 +0200)]
h264: do not return on sidedata allocation failure

Not having allocated it is not a good reason to leave the object
in an undetermined state. Though a particular setting like the
AV_EF_* flags could be useful to control that behaviour.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: fix 1 vs. 0 typo
Michael Niedermayer [Fri, 22 Aug 2014 21:00:41 +0000 (23:00 +0200)]
avcodec/hevc_ps: fix 1 vs. 0 typo

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovidstabutils: improve documentation
Timothy Gu [Fri, 22 Aug 2014 02:12:10 +0000 (19:12 -0700)]
vidstabutils: improve documentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovidstab*: Remove accidentally exported av_2_vs_pixel_format()
Timothy Gu [Fri, 22 Aug 2014 02:12:09 +0000 (19:12 -0700)]
vidstab*: Remove accidentally exported av_2_vs_pixel_format()

Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.

Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3526ab891c28396ada8b58bf7647309bab30de1d'
Michael Niedermayer [Fri, 22 Aug 2014 19:55:00 +0000 (21:55 +0200)]
Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
  qt-faststart: Undefine fseeko/ftello before defining them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'
Michael Niedermayer [Fri, 22 Aug 2014 19:49:00 +0000 (21:49 +0200)]
Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'

* commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6':
  os_support: Undefine lseek/stat/fstat before defining them

Conflicts:
libavformat/os_support.h

See: ef122ff5072463366c020157f0a27aad7e6610db
See: ed3c0fe85dd5c228e98126b18e50ffb617e77070
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
Michael Niedermayer [Fri, 22 Aug 2014 19:14:43 +0000 (21:14 +0200)]
Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'

* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h

See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'
Michael Niedermayer [Fri, 22 Aug 2014 18:59:49 +0000 (20:59 +0200)]
Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'

* commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421':
  electronicarts: set the framerate for TGQ/TQI

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'
Michael Niedermayer [Fri, 22 Aug 2014 17:52:49 +0000 (19:52 +0200)]
Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'

* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
  electronicarts: read the framerate for MAD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavpackenc: reset trailer info on block encoding
Christophe Gisquet [Fri, 22 Aug 2014 09:31:45 +0000 (09:31 +0000)]
wavpackenc: reset trailer info on block encoding

In some cases, in particular if several blocks are needed because of
the channel layout (e.g. 2.1), the information used to write the
trailing bits terminating the sample data was not reset.

This would cause potential desync on the decoder, although decoded
samples were actually mostly fine.

Fixes ticket #3879.

5 years agowavpack: check number of channels
Christophe Gisquet [Fri, 22 Aug 2014 09:31:44 +0000 (09:31 +0000)]
wavpack: check number of channels

This means container and codec disagree. The codec is supposed to
know better so this could be an error instead.

5 years agoMerge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
Michael Niedermayer [Fri, 22 Aug 2014 17:01:26 +0000 (19:01 +0200)]
Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'

* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
  electronicarts: do not fail on zero-sized chunks

Conflicts:
libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'
Michael Niedermayer [Fri, 22 Aug 2014 16:49:22 +0000 (18:49 +0200)]
Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'

* commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

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

* commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f':
  configure: Suppress "potentially uninitialized variable" warnings from MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoqt-faststart: Undefine fseeko/ftello before defining them
Diego Biurrun [Fri, 15 Aug 2014 19:43:48 +0000 (21:43 +0200)]
qt-faststart: Undefine fseeko/ftello before defining them

This avoids a number of redefinition warnings on MinGW64.

5 years agoos_support: Undefine lseek/stat/fstat before defining them
Diego Biurrun [Fri, 15 Aug 2014 19:42:56 +0000 (21:42 +0200)]
os_support: Undefine lseek/stat/fstat before defining them

This avoids a number of redefinition warnings on MinGW64.

5 years agox86: hevcdsp: use compilation-time-fixed constant
Christophe Gisquet [Mon, 28 Jul 2014 17:17:28 +0000 (17:17 +0000)]
x86: hevcdsp: use compilation-time-fixed constant

The stride for some buffers is known.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevcdsp: remove more instances of compile-time-fixed parameters
Christophe Gisquet [Mon, 28 Jul 2014 10:13:06 +0000 (12:13 +0200)]
hevcdsp: remove more instances of compile-time-fixed parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevcdsp: remove compilation-time-fixed parameter
Christophe Gisquet [Mon, 28 Jul 2014 17:17:26 +0000 (17:17 +0000)]
hevcdsp: remove compilation-time-fixed parameter

The dststride parameter is always MAX_PB_SIZE.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>