ffmpeg.git
4 years agodoc/examples: fix lib math dep for decoding_encoding
Andreas Cadhalpun [Fri, 9 Jan 2015 16:50:27 +0000 (17:50 +0100)]
doc/examples: fix lib math dep for decoding_encoding

It uses at least sin().

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: enable vsx together with altivec for ppc64el
Andreas Cadhalpun [Fri, 9 Jan 2015 16:32:09 +0000 (17:32 +0100)]
configure: enable vsx together with altivec for ppc64el

The altivec optimizations on little endian ppc64 don't work without vsx.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Suite Version...
Michael Niedermayer [Sat, 10 Jan 2015 02:43:54 +0000 (03:43 +0100)]
avformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Suite Version 4.0.12.1"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/internal: add fixme to ff_norm_qscale() to document obvious scaling issue
Michael Niedermayer [Sat, 10 Jan 2015 01:27:49 +0000 (02:27 +0100)]
avfilter/internal: add fixme to ff_norm_qscale() to document obvious scaling issue

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: Factorize the use of norm_qscale in pp7
Arwa Arif [Fri, 9 Jan 2015 20:13:42 +0000 (01:43 +0530)]
avfilter: Factorize the use of norm_qscale in pp7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agorm: fix memory leak on init failure
wm4 [Fri, 9 Jan 2015 20:24:54 +0000 (21:24 +0100)]
rm: fix memory leak on init failure

AVInputFormat.read_close is not called if AVInputFormat.read_header
fails, so this needs to be handled separately.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: Use av_malloc_array()
Michael Niedermayer [Tue, 6 Jan 2015 16:55:50 +0000 (17:55 +0100)]
ffserver: Use av_malloc_array()

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/vf_pp7: port dctB_mmx to yasm
James Almer [Fri, 9 Jan 2015 19:51:13 +0000 (16:51 -0300)]
x86/vf_pp7: port dctB_mmx to yasm

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
Michael Niedermayer [Fri, 9 Jan 2015 20:25:26 +0000 (21:25 +0100)]
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'

* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
  matroskaenc: refuse to write AAC without valid extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'
Michael Niedermayer [Fri, 9 Jan 2015 19:51:17 +0000 (20:51 +0100)]
Merge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'

* commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c':
  mpeg4audio: check the init_get_bits() return value

Conflicts:
libavcodec/mpeg4audio.c

See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ass_split: use *alloc_array()
Michael Niedermayer [Fri, 9 Jan 2015 19:20:00 +0000 (20:20 +0100)]
avcodec/ass_split: use *alloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ass: Use av_realloc_array()
Michael Niedermayer [Fri, 9 Jan 2015 17:57:37 +0000 (18:57 +0100)]
avcodec/ass: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi: port mp=pp7 to libavfilter
Arwa Arif [Thu, 25 Dec 2014 04:20:24 +0000 (09:50 +0530)]
lavfi: port mp=pp7 to libavfilter

The only difference with mp=pp7 is that default mode is "medium", as stated
in the MPlayer docs, rather than "hard".

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
4 years agoavformat/hdsenc: Remove redundant NULL pointer checks
Michael Niedermayer [Fri, 9 Jan 2015 14:54:15 +0000 (15:54 +0100)]
avformat/hdsenc: Remove redundant NULL pointer checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: remove unneeded NULL pointer check
Michael Niedermayer [Fri, 9 Jan 2015 14:51:32 +0000 (15:51 +0100)]
ffmpeg: remove unneeded NULL pointer check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/uncoded_frame: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 9 Jan 2015 14:46:13 +0000 (15:46 +0100)]
tools/uncoded_frame: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskaenc: refuse to write AAC without valid extradata
Anton Khirnov [Thu, 1 Jan 2015 17:22:46 +0000 (18:22 +0100)]
matroskaenc: refuse to write AAC without valid extradata

4 years agompeg4audio: check the init_get_bits() return value
Anton Khirnov [Thu, 1 Jan 2015 16:56:56 +0000 (17:56 +0100)]
mpeg4audio: check the init_get_bits() return value

Fixes possible invalid reads.

CC:libav-stable@libav.org

4 years agoavformat/tee: Simplify code by using avio_closep()
Michael Niedermayer [Fri, 9 Jan 2015 12:40:09 +0000 (13:40 +0100)]
avformat/tee: Simplify code by using avio_closep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/sapenc: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 9 Jan 2015 12:39:48 +0000 (13:39 +0100)]
avformat/sapenc: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 9 Jan 2015 12:39:06 +0000 (13:39 +0100)]
avformat/utils: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: fix parser return values in error case
wm4 [Fri, 9 Jan 2015 01:13:36 +0000 (02:13 +0100)]
vp9: fix parser return values in error case

The parser must always set the out_size and out_data pointers. The API
seems to require it, and the common code in parser.c also relies on it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: fix convoluted shlib code
Michael Niedermayer [Sun, 21 Dec 2014 02:46:53 +0000 (03:46 +0100)]
configure: fix convoluted shlib code

Fixes Ticket 4199

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aiffdec: improve readability
Peter Ross [Thu, 8 Jan 2015 23:09:04 +0000 (10:09 +1100)]
avformat/aiffdec: improve readability

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoSkip Exif data when auto-detecting jpeg images.
Carl Eugen Hoyos [Thu, 8 Jan 2015 23:30:02 +0000 (00:30 +0100)]
Skip Exif data when auto-detecting jpeg images.

4 years agoffmpeg: Clear error message array at init.
Michael Niedermayer [Thu, 8 Jan 2015 22:02:30 +0000 (23:02 +0100)]
ffmpeg: Clear error message array at init.

This avoids printing uninitialized bytes if no error message is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 19:11:00 +0000 (20:11 +0100)]
avformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mlvdec: Simplify code by using avio_closep()
Michael Niedermayer [Thu, 8 Jan 2015 19:10:47 +0000 (20:10 +0100)]
avformat/mlvdec: Simplify code by using avio_closep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 19:09:30 +0000 (20:09 +0100)]
avformat/mov: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpenc_chain: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 19:08:24 +0000 (20:08 +0100)]
avformat/rtpenc_chain: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 19:08:24 +0000 (20:08 +0100)]
avformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvdsubdec: fix accessing dangling pointers
wm4 [Thu, 8 Jan 2015 16:19:17 +0000 (17:19 +0100)]
avcodec/dvdsubdec: fix accessing dangling pointers

dvdsub_decode() can call append_to_cached_buf() 2 times, the second time
with ctx->buf as argument. If the second append_to_cached_buf() reallocs
ctx->buf, the argument will be a pointer to the previous, freed block.
This can cause invalid reads at least with some fuzzed files - and
possibly with valid files.

Since packets can apparently not be larger than 64K (even if packets are
combined), just use a fixed size buffer. It will be allocated as part of
the DVDSubContext, and although some memory is "wasted", it's relatively
minimal by modern standards and should be acceptable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e'
Michael Niedermayer [Thu, 8 Jan 2015 16:35:17 +0000 (17:35 +0100)]
Merge commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e'

* commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e':
  libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9'
Michael Niedermayer [Thu, 8 Jan 2015 16:26:57 +0000 (17:26 +0100)]
Merge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9'

* commit '3852e2c926ddb166c7aa69c4644a86100ea144d9':
  libopenh264enc: Fix a typo and some nitpicks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8'
Michael Niedermayer [Thu, 8 Jan 2015 16:12:49 +0000 (17:12 +0100)]
Merge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8'

* commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8':
  doc: Add initial documentation about the OpenH264 encoder wrapper

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/boxblur: Readd 8bit colour spaces on big-endian.
Carl Eugen Hoyos [Thu, 8 Jan 2015 14:24:59 +0000 (15:24 +0100)]
lavfi/boxblur: Readd 8bit colour spaces on big-endian.

4 years agoavformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 13:51:04 +0000 (14:51 +0100)]
avformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 13:50:34 +0000 (14:50 +0100)]
avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 13:50:07 +0000 (14:50 +0100)]
avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hdsenc: Simplify code by using avio_closep()
Michael Niedermayer [Thu, 8 Jan 2015 13:13:36 +0000 (14:13 +0100)]
avformat/hdsenc: Simplify code by using avio_closep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 13:11:44 +0000 (14:11 +0100)]
avdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: Use avio_closep() to avoid leaving stale pointers in memor
Michael Niedermayer [Thu, 8 Jan 2015 13:11:12 +0000 (14:11 +0100)]
ffserver: Use avio_closep() to avoid leaving stale pointers in memor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 13:10:58 +0000 (14:10 +0100)]
ffmpeg: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 8 Jan 2015 13:10:23 +0000 (14:10 +0100)]
ffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version...
Martin Storsjö [Wed, 7 Jan 2015 21:49:41 +0000 (23:49 +0200)]
libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac

The latest version added support for a new option for enabling
a signal level limiter, which adds some extra delay. In fdk-aac, this
is enabled by default, but disable it by default here since we'd rather
have zero-delay decoding.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibopenh264enc: Fix a typo and some nitpicks
Martin Storsjö [Wed, 7 Jan 2015 22:03:09 +0000 (00:03 +0200)]
libopenh264enc: Fix a typo and some nitpicks

Also move the .long_name entry to below the .name entry.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc: Add initial documentation about the OpenH264 encoder wrapper
Martin Storsjö [Wed, 7 Jan 2015 22:02:05 +0000 (00:02 +0200)]
doc: Add initial documentation about the OpenH264 encoder wrapper

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc/examples/transcoding: Use avio_closep() in examples as it avoids leaving stale...
Michael Niedermayer [Thu, 8 Jan 2015 04:10:55 +0000 (05:10 +0100)]
doc/examples/transcoding: Use avio_closep() in examples as it avoids leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoidoc/examples/remuxing: Use avio_closep() in examples as it avoids leaving stale...
Michael Niedermayer [Thu, 8 Jan 2015 04:10:39 +0000 (05:10 +0100)]
idoc/examples/remuxing: Use avio_closep() in examples as it avoids leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples/transcode_aac: Use avio_closep() in examples as it avoids leaving stale...
Michael Niedermayer [Thu, 8 Jan 2015 04:09:52 +0000 (05:09 +0100)]
doc/examples/transcode_aac: Use avio_closep() in examples as it avoids leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples/muxing: Use avio_closep() in examples as it avoids leaving stale pointers
Michael Niedermayer [Thu, 8 Jan 2015 04:09:06 +0000 (05:09 +0100)]
doc/examples/muxing: Use avio_closep() in examples as it avoids leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: fix typos
Lou Logan [Thu, 8 Jan 2015 02:16:54 +0000 (17:16 -0900)]
doc: fix typos

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoavcodec/dvdsubdec: error on bitmaps with size 0
wm4 [Wed, 7 Jan 2015 22:57:50 +0000 (23:57 +0100)]
avcodec/dvdsubdec: error on bitmaps with size 0

Attemtping to decode them could lead to invalid writes with some fuzzed
samples.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'
Michael Niedermayer [Wed, 7 Jan 2015 23:04:17 +0000 (00:04 +0100)]
Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c'

* commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c':
  xsub: Support DXSA subtitles

Conflicts:
libavcodec/xsubdec.c

See: d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '01168bf1405ddbf671f1074a927b951b8777adbb'
Michael Niedermayer [Wed, 7 Jan 2015 21:48:15 +0000 (22:48 +0100)]
Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb'

* commit '01168bf1405ddbf671f1074a927b951b8777adbb':
  mpeg: Remove unused field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: Clear contexts after deallocation
Michael Niedermayer [Wed, 7 Jan 2015 21:29:16 +0000 (22:29 +0100)]
avformat/segment: Clear contexts after deallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b3f04657368a32a9903406395f865e230b1de348'
Michael Niedermayer [Wed, 7 Jan 2015 21:15:45 +0000 (22:15 +0100)]
Merge commit 'b3f04657368a32a9903406395f865e230b1de348'

* commit 'b3f04657368a32a9903406395f865e230b1de348':
  segment: Fix the failure paths

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aic: Use av_malloc_array
Michael Niedermayer [Wed, 7 Jan 2015 18:46:16 +0000 (19:46 +0100)]
avcodec/aic: Use av_malloc_array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Check for av_realloc_array() failure
Michael Niedermayer [Wed, 7 Jan 2015 17:09:52 +0000 (18:09 +0100)]
ffmpeg_opt: Check for av_realloc_array() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Use av_realloc_array()
Michael Niedermayer [Wed, 7 Jan 2015 16:26:39 +0000 (17:26 +0100)]
ffmpeg_opt: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libxvid: fix potential integer overflow
Michael Niedermayer [Wed, 7 Jan 2015 16:23:25 +0000 (17:23 +0100)]
avcodec/libxvid: fix potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dvbsub: remove unused variable
Michael Niedermayer [Wed, 7 Jan 2015 16:20:39 +0000 (17:20 +0100)]
avformat/dvbsub: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoxsub: Support DXSA subtitles
Alexandre Colucci [Wed, 7 Jan 2015 11:18:08 +0000 (12:18 +0100)]
xsub: Support DXSA subtitles

These have a DXSA tag and contain alpha in addition to
color values for palette.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agompeg: Remove unused field
Luca Barbato [Tue, 30 Dec 2014 22:17:17 +0000 (23:17 +0100)]
mpeg: Remove unused field

4 years agoavcodec/mpeg12: Try to fetch pts/dts from both the packet associated with the picture...
Michael Niedermayer [Wed, 7 Jan 2015 11:18:40 +0000 (12:18 +0100)]
avcodec/mpeg12: Try to fetch pts/dts from both the packet associated with the picture start code as well as earlier start codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agosegment: Fix the failure paths
Luca Barbato [Mon, 5 Jan 2015 09:40:41 +0000 (10:40 +0100)]
segment: Fix the failure paths

A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.

CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
4 years agoavcodec/parser: add fuzzy mode to ff_fetch_timestamp()
Michael Niedermayer [Wed, 7 Jan 2015 10:52:08 +0000 (11:52 +0100)]
avcodec/parser: add fuzzy mode to ff_fetch_timestamp()

This will be needed for the following timestamp fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/allcodecs: prefer x264 over openh264 if both are available
Michael Niedermayer [Wed, 7 Jan 2015 00:15:57 +0000 (01:15 +0100)]
avcodec/allcodecs: prefer x264 over openh264 if both are available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'
Michael Niedermayer [Tue, 6 Jan 2015 23:48:23 +0000 (00:48 +0100)]
Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'

* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
  libavcodec: Add an OpenH264 encoder wrapper

Conflicts:
Changelog
configure
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd'
Michael Niedermayer [Tue, 6 Jan 2015 23:46:40 +0000 (00:46 +0100)]
Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd'

* commit '2a1500fb552364488cfbee3e29e296788a3a6bdd':
  movenc: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
Michael Niedermayer [Tue, 6 Jan 2015 23:38:50 +0000 (00:38 +0100)]
Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'

* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'
Michael Niedermayer [Tue, 6 Jan 2015 23:29:42 +0000 (00:29 +0100)]
Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'

* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'
Michael Niedermayer [Tue, 6 Jan 2015 23:12:52 +0000 (00:12 +0100)]
Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'

* commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1':
  msmpeg4: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'
Michael Niedermayer [Tue, 6 Jan 2015 23:04:35 +0000 (00:04 +0100)]
Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'

* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907':
  ulti: invert the order of parameters of ulti_decode_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'
Michael Niedermayer [Tue, 6 Jan 2015 23:03:02 +0000 (00:03 +0100)]
Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'

* commit '4438c256387a5845e5cdc5c14c43f4047b68301b':
  vf_interlace: remove the warning tag in the message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '15ea222778caaec0877b3f9938140b707c931d96'
Michael Niedermayer [Tue, 6 Jan 2015 22:50:45 +0000 (23:50 +0100)]
Merge commit '15ea222778caaec0877b3f9938140b707c931d96'

* commit '15ea222778caaec0877b3f9938140b707c931d96':
  vf_interlace: merge FIELD_LOWER check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'
Michael Niedermayer [Tue, 6 Jan 2015 22:40:11 +0000 (23:40 +0100)]
Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'

* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
  vf_interlace: also assert for height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovfilter/vf_tinterlace: Fix issues with linesize and cols
Michael Niedermayer [Tue, 6 Jan 2015 22:20:18 +0000 (23:20 +0100)]
vfilter/vf_tinterlace: Fix issues with linesize and cols

Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from 696141e898193311c994b399a8dc60713709092f

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '696141e898193311c994b399a8dc60713709092f'
Michael Niedermayer [Tue, 6 Jan 2015 21:38:11 +0000 (22:38 +0100)]
Merge commit '696141e898193311c994b399a8dc60713709092f'

* commit '696141e898193311c994b399a8dc60713709092f':
  vf_interlace: use image width rather than linesize

Conflicts:
libavfilter/vf_interlace.c

See: f043965cd5145d8540d55c013b0d809b6a874c53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fe082998683334e7f573cfe3876810fb80c5249c'
Michael Niedermayer [Tue, 6 Jan 2015 21:33:18 +0000 (22:33 +0100)]
Merge commit 'fe082998683334e7f573cfe3876810fb80c5249c'

* commit 'fe082998683334e7f573cfe3876810fb80c5249c':
  build: Use -Werror=format-security

Conflicts:
configure

See: 97592faa51eacda9a949c4f0ba2a6d7989ef5f3b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'
Michael Niedermayer [Tue, 6 Jan 2015 21:12:53 +0000 (22:12 +0100)]
Merge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'

* commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0':
  vda: error out if decoded CVPixelBuffer is empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1enc: Fix incompatible pointer type warning
Michael Niedermayer [Tue, 6 Jan 2015 21:05:13 +0000 (22:05 +0100)]
avcodec/ffv1enc: Fix incompatible pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'
Michael Niedermayer [Tue, 6 Jan 2015 21:03:57 +0000 (22:03 +0100)]
Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'

* commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b':
  ffv1: const correctness for encode_rgb_frame()

Conflicts:
libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
Michael Niedermayer [Tue, 6 Jan 2015 20:54:26 +0000 (21:54 +0100)]
Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'

* commit 'ca09effb01e126b0ac74ff3de70a475423ddee82':
  ffv1: Drop unnecessary casts and const qualifiers to match function signatures

Conflicts:
libavcodec/ffv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'
Michael Niedermayer [Tue, 6 Jan 2015 20:44:08 +0000 (21:44 +0100)]
Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'

* commit '1dd797e3c9f179f957316a0becbec048b42df8aa':
  swscale: check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'
Michael Niedermayer [Tue, 6 Jan 2015 20:37:33 +0000 (21:37 +0100)]
Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'

* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/ismindex.c: Use av_realloc_array()
Michael Niedermayer [Tue, 6 Jan 2015 20:08:20 +0000 (21:08 +0100)]
tools/ismindex.c: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/ismindex: Keep count fields consistent with arrays in case of errors
Michael Niedermayer [Tue, 6 Jan 2015 20:07:50 +0000 (21:07 +0100)]
tools/ismindex: Keep count fields consistent with arrays in case of errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec: Add an OpenH264 encoder wrapper
Martin Storsjö [Thu, 12 Dec 2013 15:13:55 +0000 (17:13 +0200)]
libavcodec: Add an OpenH264 encoder wrapper

Compared to existing, common opensource H264 encoders, this can be
useful since it has got a different license (BSD instead of GPL).

Performance- and qualitywise it is comparable to x264 in ultrafast
mode.

Hooking it up as an encoder in libavcodec also simplifies comparing
it against other common encoders.

This requires OpenH264 1.3 or newer. Since the OpenH264 API and ABI
changes frequently, only releases are supported.

To take advantage of the OpenH264 patent offer, the OpenH264 library
must not be redistributed, but downloaded at runtime at the end-user's
system.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Fix a typo in a comment
Martin Storsjö [Mon, 5 Jan 2015 13:13:48 +0000 (15:13 +0200)]
movenc: Fix a typo in a comment

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Readd an accidentally removed condition
Martin Storsjö [Mon, 5 Jan 2015 13:07:01 +0000 (15:07 +0200)]
movenc: Readd an accidentally removed condition

This was removed accidentally as part of 847bf598. This could cause
groundless warning logging.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agocmdutils.c: Use av_realloc_array()
Michael Niedermayer [Tue, 6 Jan 2015 16:52:54 +0000 (17:52 +0100)]
cmdutils.c: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoisom: add 'mp1v' fourcc
Justin Ruggles [Tue, 4 Feb 2014 20:40:32 +0000 (15:40 -0500)]
isom: add 'mp1v' fourcc

As referenced in the CoreMedia API docs.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agomsmpeg4: check memory allocations and propagate errors
Vittorio Giovara [Wed, 17 Dec 2014 15:02:10 +0000 (16:02 +0100)]
msmpeg4: check memory allocations and propagate errors

Bug-Id: CID 1257781

4 years agoulti: invert the order of parameters of ulti_decode_frame()
Vittorio Giovara [Thu, 18 Dec 2014 19:26:58 +0000 (20:26 +0100)]
ulti: invert the order of parameters of ulti_decode_frame()

This is the order that the caller uses in the rest of the file.
Variables are modified to reflect the order above too and their
initialization is merged with their declarationt. No behavioral
change.

Bug-Id: CID 732286

4 years agoavformat/id3v2: support USLT tags
wm4 [Mon, 5 Jan 2015 17:56:20 +0000 (18:56 +0100)]
avformat/id3v2: support USLT tags

I think this turned out pretty terrible. There's no good way to add new
custom tags that write to AVFormatContext->metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()
Michael Niedermayer [Tue, 6 Jan 2015 12:12:22 +0000 (13:12 +0100)]
cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointe...
Michael Niedermayer [Tue, 6 Jan 2015 11:53:53 +0000 (12:53 +0100)]
avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/buffer: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:53:25 +0000 (12:53 +0100)]
avfilter/buffer: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:52:55 +0000 (12:52 +0100)]
avformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory

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