ffmpeg.git
4 years agowebmdashenc: Support for live stream manifests
Vignesh Venkatasubramanian [Wed, 1 Apr 2015 02:40:01 +0000 (19:40 -0700)]
webmdashenc: Support for live stream manifests

This patch adds support for creating DASH manifests for WebM Live
Streams. It also updates the documentation and adds a fate test to
verify the behavior of the new muxer flag.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'
Michael Niedermayer [Sat, 4 Apr 2015 22:55:04 +0000 (00:55 +0200)]
Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'

* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1':
  avconv: Avoid theoretical NULL dereferences

See: d768f8f5cfe876cd8eedb045eeb87e307ac4a674
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskadec: Add support for parsing live header files
Vignesh Venkatasubramanian [Tue, 31 Mar 2015 23:51:57 +0000 (16:51 -0700)]
matroskadec: Add support for parsing live header files

This patch adds support for parsing live files (produced by
-f webm_chunk) which contains only the headers but no packets. This
is only used when using -f webm_dash_manifest. There will be a
follow up patch which adds live support to WebM DASH Manifest
muxer.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 4 Apr 2015 18:14:51 +0000 (20:14 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mov: Do not overread iTunes metadata.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavconv: Avoid theoretical NULL dereferences
Himangi Saraogi [Wed, 1 Apr 2015 19:33:04 +0000 (01:03 +0530)]
avconv: Avoid theoretical NULL dereferences

Bug-Id: CID 1292519

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/h264_refs: More completely clear slice contexts in ff_h264_remove_all_refs()
Michael Niedermayer [Sat, 4 Apr 2015 17:30:10 +0000 (19:30 +0200)]
avcodec/h264_refs: More completely clear slice contexts in ff_h264_remove_all_refs()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode
Michael Niedermayer [Sat, 4 Apr 2015 17:28:33 +0000 (19:28 +0200)]
avcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode

Fixes Ticket4408

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame
Michael Niedermayer [Sat, 4 Apr 2015 16:31:00 +0000 (18:31 +0200)]
avcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_refs: Do not set reference to things which dont exist
Michael Niedermayer [Sat, 4 Apr 2015 16:08:23 +0000 (18:08 +0200)]
avcodec/h264_refs: Do not set reference to things which dont exist

Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mov: Do not overread iTunes metadata.
Carl Eugen Hoyos [Sat, 4 Apr 2015 15:35:06 +0000 (17:35 +0200)]
lavf/mov: Do not overread iTunes metadata.

Fixes ticket #4425.

4 years agoavcodec/h264_slice: make current_slice reset code more strict
Michael Niedermayer [Sat, 4 Apr 2015 14:08:40 +0000 (16:08 +0200)]
avcodec/h264_slice: make current_slice reset code more strict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: use goto end instead of return for hwaccel fails as well
Michael Niedermayer [Sat, 4 Apr 2015 12:40:40 +0000 (14:40 +0200)]
avcodec/h264: use goto end instead of return for hwaccel fails as well

This is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtsp: Fix null pointer dereference
Himangi Saraogi [Sat, 4 Apr 2015 10:51:40 +0000 (16:21 +0530)]
avformat/rtsp: Fix null pointer dereference

This fixes CID 1257827.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/assenc: style nits
Rodger Combs [Sat, 4 Apr 2015 10:31:21 +0000 (05:31 -0500)]
lavf/assenc: style nits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskadec: export cover art correctly
wm4 [Fri, 3 Apr 2015 14:11:53 +0000 (16:11 +0200)]
matroskadec: export cover art correctly

Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.

Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.

Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.

Fixes trac #4423.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg4: use a self-explanatory #define MAX_NVOP_SIZE
Andreas Cadhalpun [Fri, 3 Apr 2015 17:14:16 +0000 (19:14 +0200)]
mpeg4: use a self-explanatory #define MAX_NVOP_SIZE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 4 Apr 2015 00:15:23 +0000 (02:15 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix codec fps diplay for very small fps.
  lavf/mpeg: Support alaw in Hikvision CCTV recordings.
  lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: silence ER warning when no slice threads are used
Michael Niedermayer [Fri, 3 Apr 2015 23:58:37 +0000 (01:58 +0200)]
avcodec/h264: silence ER warning when no slice threads are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add Reynaldo as a Twitter maintainer
Lou Logan [Fri, 3 Apr 2015 23:59:17 +0000 (15:59 -0800)]
MAINTAINERS: add Reynaldo as a Twitter maintainer

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoavcodec/h264: reenable ER except with slice threads by default
Michael Niedermayer [Fri, 3 Apr 2015 23:02:29 +0000 (01:02 +0200)]
avcodec/h264: reenable ER except with slice threads by default

ER with slice threads is buggy and since the merge of the libav cleanup broken
as the ER context which is supposed to be per frame has been placed in
the slice context, so there are multiple per frame which does not work as is.

Theres no bug report about ER with frame threads. If someone knows of a
case where it crashes / fails without slice threads please mail me and
open a ticket on trac.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'
Michael Niedermayer [Fri, 3 Apr 2015 22:49:57 +0000 (00:49 +0200)]
Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'

* commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c':
  h264: disable ER by default

Conflicts:
libavcodec/h264.c
libavcodec/h264_picture.c
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'
Michael Niedermayer [Fri, 3 Apr 2015 22:38:02 +0000 (00:38 +0200)]
Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'

* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Fix extradata allocation
Michael Niedermayer [Fri, 3 Apr 2015 21:44:38 +0000 (23:44 +0200)]
ffmpeg: Fix extradata allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate/hevc: Use a bitexact scaler in the hevc param change test to avoid failing...
Michael Niedermayer [Fri, 3 Apr 2015 20:48:33 +0000 (22:48 +0200)]
tests/fate/hevc: Use a bitexact scaler in the hevc param change test to avoid failing on non x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b2965ec7761c99e8ef9c217a28a517e37f010480'
Michael Niedermayer [Fri, 3 Apr 2015 20:23:52 +0000 (22:23 +0200)]
Merge commit 'b2965ec7761c99e8ef9c217a28a517e37f010480'

* commit 'b2965ec7761c99e8ef9c217a28a517e37f010480':
  FATE: add a test for parameter changes in HEVC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'
Michael Niedermayer [Fri, 3 Apr 2015 20:16:10 +0000 (22:16 +0200)]
Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'

* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c':
  hevc: make sure no dangling pointers remain around on VPS/SPS change

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'
Michael Niedermayer [Fri, 3 Apr 2015 19:37:03 +0000 (21:37 +0200)]
Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'

* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
  hevc: do not change the VPS if its contents are the same

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'
Michael Niedermayer [Fri, 3 Apr 2015 19:29:50 +0000 (21:29 +0200)]
Merge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'

* commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa':
  hevc: export stream parameters from extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix codec fps diplay for very small fps.
Carl Eugen Hoyos [Fri, 3 Apr 2015 19:07:06 +0000 (21:07 +0200)]
Fix codec fps diplay for very small fps.

Fixes codec banner for the sample from ticket #4369.

4 years agolavf/mpeg: Support alaw in Hikvision CCTV recordings.
Carl Eugen Hoyos [Fri, 3 Apr 2015 19:04:43 +0000 (21:04 +0200)]
lavf/mpeg: Support alaw in Hikvision CCTV recordings.

Fixes a sample from ticket #4182.

4 years agolavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Carl Eugen Hoyos [Fri, 3 Apr 2015 18:58:20 +0000 (20:58 +0200)]
lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.

Fixes a sample from ticket #4182.

4 years agoMerge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'
Michael Niedermayer [Fri, 3 Apr 2015 19:11:19 +0000 (21:11 +0200)]
Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'

* commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5':
  hevc: split out setting AVCodecContext parameters

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'
Michael Niedermayer [Fri, 3 Apr 2015 18:53:52 +0000 (20:53 +0200)]
Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'

* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
  mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Conflicts:
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: fix "Commmand" typo
Lou Logan [Fri, 3 Apr 2015 18:43:21 +0000 (10:43 -0800)]
cmdutils: fix "Commmand" typo

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agompeg4: only show the divx_packed warning, when a packed frame is present
Andreas Cadhalpun [Fri, 3 Apr 2015 17:14:31 +0000 (19:14 +0200)]
mpeg4: only show the divx_packed warning, when a packed frame is present

Otherwise it is shown even after the file was fixed with avidemux,
because the userdata string still ends with 'p'.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Fix indentation
Michael Niedermayer [Fri, 3 Apr 2015 17:39:06 +0000 (19:39 +0200)]
ffmpeg: Fix indentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: last frame duplication heuristic
Michael Niedermayer [Wed, 19 Nov 2014 11:41:16 +0000 (12:41 +0100)]
ffmpeg: last frame duplication heuristic

This improves the last frames duration with CFR and when the input durations
are inaccurate or missing

Fixes Ticket4119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()
Rong Yan [Fri, 3 Apr 2015 12:36:18 +0000 (12:36 +0000)]
avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()

add marcos VEC_FMERGEH() VEC_FMERGEL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofiltfmts: Avoid null pointer dereference
Himangi Saraogi [Fri, 3 Apr 2015 14:16:05 +0000 (19:46 +0530)]
filtfmts: Avoid null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxf.c: Relaxed ProRes pattern
Steve Dierker [Thu, 2 Apr 2015 09:51:08 +0000 (11:51 +0200)]
libavformat/mxf.c: Relaxed ProRes pattern

I found another MXF File containing ProRes with the following
codec_uls: 060E2B34040101010E04020102110500
Therefor I relaxed the pattern.

Related to issue #4349

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: disable ER by default
Anton Khirnov [Tue, 31 Mar 2015 08:35:15 +0000 (10:35 +0200)]
h264: disable ER by default

The way it is currently designed is fundamentally unsafe and cannot be
reasonably fixed without completely rewriting it.

4 years agoavconv: do not overwrite the stream codec context for streamcopy
Anton Khirnov [Thu, 2 Apr 2015 04:09:05 +0000 (06:09 +0200)]
avconv: do not overwrite the stream codec context for streamcopy

Since we are not doing encoding, there is no point in ever touching the
separate encoding context. Always use the stream codec context.

Fixes writing attachments.

CC:libav-devel@libav.org

4 years agoFATE: add a test for parameter changes in HEVC
Anton Khirnov [Sun, 29 Mar 2015 14:07:36 +0000 (16:07 +0200)]
FATE: add a test for parameter changes in HEVC

4 years agohevc: make sure no dangling pointers remain around on VPS/SPS change
Anton Khirnov [Sun, 29 Mar 2015 13:24:46 +0000 (15:24 +0200)]
hevc: make sure no dangling pointers remain around on VPS/SPS change

4 years agohevc: do not change the VPS if its contents are the same
Anton Khirnov [Sun, 29 Mar 2015 13:20:30 +0000 (15:20 +0200)]
hevc: do not change the VPS if its contents are the same

This is the same as is done for SPS.

4 years agohevc: export stream parameters from extradata
Anton Khirnov [Sun, 29 Mar 2015 12:15:41 +0000 (14:15 +0200)]
hevc: export stream parameters from extradata

This allows the callers to have a hint of the probable stream parameters
without actually decoding anything.

4 years agohevc: split out setting AVCodecContext parameters
Anton Khirnov [Sun, 29 Mar 2015 12:09:51 +0000 (14:09 +0200)]
hevc: split out setting AVCodecContext parameters

Additionally always set the software pixel format, so it's available
even if ff_get_format() is not called later. This will be useful for
exporting stream parameters from init().

4 years agompegtsenc: Take max_delay into account when buffering multiple audio packets into...
Martin Storsjö [Thu, 2 Apr 2015 08:09:31 +0000 (11:09 +0300)]
mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Make sure we don't buffer up more than max_delay worth of data
before writing a PES packet, even if pes_payload_size is set to
a larger value.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc/examples: Handle new types in avio_list_dir
Mariusz Szczepańczyk [Fri, 3 Apr 2015 01:54:09 +0000 (03:54 +0200)]
doc/examples: Handle new types in avio_list_dir

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/avio: Add new types to AVIODirEntryType, bump minor version
Mariusz Szczepańczyk [Fri, 3 Apr 2015 01:54:08 +0000 (03:54 +0200)]
lavf/avio: Add new types to AVIODirEntryType, bump minor version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: Slightly revise AviSynth version info
Stephen Hutchinson [Thu, 2 Apr 2015 19:38:55 +0000 (15:38 -0400)]
doc: Slightly revise AviSynth version info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/ftp: remove fixed length buffers from context
Lukasz Marek [Thu, 2 Apr 2015 22:00:23 +0000 (00:00 +0200)]
lavf/ftp: remove fixed length buffers from context

It saves some memory.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agolavf/ftp: parse user and password once
Lukasz Marek [Thu, 2 Apr 2015 17:22:00 +0000 (19:22 +0200)]
lavf/ftp: parse user and password once

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoavisynth: Bump minimum required version to interface version 6
Stephen Hutchinson [Thu, 2 Apr 2015 19:38:54 +0000 (15:38 -0400)]
avisynth: Bump minimum required version to interface version 6

The AVSC_API changes in the new headers mean that the 2.6 alphas
are just as incompatible as 2.5 is.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: Fix detection of AviSynth 2.5
Stephen Hutchinson [Thu, 2 Apr 2015 19:38:53 +0000 (15:38 -0400)]
avisynth: Fix detection of AviSynth 2.5

In order to safely exit when the user tries to use AviSynth 2.5,
the continue_on_fail value for 2.6's functions need to be set to
1.  Otherwise, the library loader fails before the 'upgrade to
2.6' log message appears.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pngenc: don't return a value in a void function
James Almer [Thu, 2 Apr 2015 20:19:41 +0000 (17:19 -0300)]
avcodec/pngenc: don't return a value in a void function

Should fix compilation failures with strict compilers

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add AVDictionary tests
Lukasz Marek [Wed, 1 Apr 2015 01:25:24 +0000 (03:25 +0200)]
fate: add AVDictionary tests

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agolavu/dict: add more tests
Lukasz Marek [Wed, 1 Apr 2015 18:03:29 +0000 (20:03 +0200)]
lavu/dict: add more tests

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agolavu/dict: fix set function when reuse existing key pointer
Lukasz Marek [Wed, 1 Apr 2015 18:01:30 +0000 (20:01 +0200)]
lavu/dict: fix set function when reuse existing key pointer

Fixes following scenario:

av_dict_set(&d, "key", "old", 0);
AVDictionaryEentry *e = av_dict_get(d, "key", NULL, 0);
av_dict_set(&d, e->key, "new", 0);

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agopng: Use libavutil's crc functions instead of zlib's
Donny Yang [Thu, 2 Apr 2015 15:09:18 +0000 (15:09 +0000)]
png: Use libavutil's crc functions instead of zlib's

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt.c: fix regression introduced in 5743095c
Tim Nicholson [Thu, 2 Apr 2015 16:41:22 +0000 (17:41 +0100)]
ffmpeg_opt.c: fix regression introduced in 5743095c

-vtag is an input and output option.

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vda_h264: try to fix build
Michael Niedermayer [Thu, 2 Apr 2015 13:58:02 +0000 (15:58 +0200)]
avcodec/vda_h264: try to fix build

Found-by: Stefano Pigozzi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovda: fix h264 decoding for avcC,vda wants the entire buffer
Rainer Hochecker [Thu, 2 Apr 2015 11:43:06 +0000 (13:43 +0200)]
vda: fix h264 decoding for avcC,vda wants the entire buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nvenc: Fix profile parameter handling
Timo Rothenpieler [Wed, 1 Apr 2015 22:04:07 +0000 (00:04 +0200)]
avcodec/nvenc: Fix profile parameter handling

It was not possible to set a profile before, the builtin profile
parameter does not seem to work propperly.
To be compatible with libx264, this overlays it with a local parameter
that expects a string, instead of an int, that takes the well known values
"high", "main" or "baseline".

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoBump lavc and lavf minor versions for apng muxer and encoder.
Carl Eugen Hoyos [Thu, 2 Apr 2015 12:09:11 +0000 (14:09 +0200)]
Bump lavc and lavf minor versions for apng muxer and encoder.

4 years agoffmpeg: Avoid null pointer dereferences
Himangi Saraogi [Thu, 2 Apr 2015 10:52:19 +0000 (16:22 +0530)]
ffmpeg: Avoid null pointer dereferences

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoapng: Add a basic APNG muxer
Donny Yang [Sat, 28 Mar 2015 08:06:24 +0000 (19:06 +1100)]
apng: Add a basic APNG muxer

Additionally, update some documentation with support for APNG

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoapng: Add a basic APNG encoder
Donny Yang [Tue, 31 Mar 2015 20:58:26 +0000 (20:58 +0000)]
apng: Add a basic APNG encoder

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavu/dict: don't accept AV_DICT_DONT_STRDUP_VAL for av_dict_set_int
Lukasz Marek [Wed, 1 Apr 2015 22:36:02 +0000 (00:36 +0200)]
lavu/dict: don't accept AV_DICT_DONT_STRDUP_VAL for av_dict_set_int

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: Remove the GOTO statement
Pranav Vaish [Wed, 1 Apr 2015 20:58:23 +0000 (02:28 +0530)]
avcodec/ccaption_dec: Remove the GOTO statement

4 years agoMerge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'
Michael Niedermayer [Wed, 1 Apr 2015 19:27:45 +0000 (21:27 +0200)]
Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

* commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad':
  rtsp: Add a buffer_size option

Conflicts:
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f'
Michael Niedermayer [Wed, 1 Apr 2015 19:12:23 +0000 (21:12 +0200)]
Merge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f'

* commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f':
  rtp: Add an option to set the send/receive buffer size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'
Michael Niedermayer [Wed, 1 Apr 2015 19:03:10 +0000 (21:03 +0200)]
Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'

* commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc':
  rtp: Map the urloptions to AVOptions

Conflicts:
libavformat/rtpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avcodec/exr: fix memset first arg in reverse_lut()"
Michael Niedermayer [Wed, 1 Apr 2015 17:53:23 +0000 (19:53 +0200)]
Revert "avcodec/exr: fix memset first arg in reverse_lut()"

This reverts commit 586ba24ff29468d2a4ee843a9650feea5b2be6f6.

Fixes Ticket 4386

Found-by: Martin Vignali <martin.vignali@gmail.com>
4 years agolavc/smvjpegdec: Avoid null dereference and return meaningful error codes
Himangi Saraogi [Wed, 1 Apr 2015 16:05:16 +0000 (21:35 +0530)]
lavc/smvjpegdec: Avoid null dereference and return meaningful error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/xwma: Use ff_alloc_extradata()
Michael Niedermayer [Wed, 1 Apr 2015 16:17:20 +0000 (18:17 +0200)]
avformat/xwma: Use ff_alloc_extradata()

This prevents the fields from potentially becoming inconsistent in case of errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures
Michael Niedermayer [Wed, 1 Apr 2015 16:11:48 +0000 (18:11 +0200)]
avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/sidxindex: Use av_*malloc_array()
Michael Niedermayer [Wed, 1 Apr 2015 15:40:30 +0000 (17:40 +0200)]
tools/sidxindex: Use av_*malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/eval: check for av_malloc failure
Michael Niedermayer [Wed, 1 Apr 2015 13:45:37 +0000 (15:45 +0200)]
avutil/eval: check for av_malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/eval: factor av_expr_free() calls out
Michael Niedermayer [Wed, 1 Apr 2015 13:45:18 +0000 (15:45 +0200)]
avutil/eval: factor av_expr_free() calls out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortsp: Add a buffer_size option
Luca Barbato [Sun, 22 Mar 2015 20:16:55 +0000 (21:16 +0100)]
rtsp: Add a buffer_size option

And forward it to rtp and udp.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agortp: Add an option to set the send/receive buffer size
Luca Barbato [Sun, 29 Mar 2015 04:26:53 +0000 (06:26 +0200)]
rtp: Add an option to set the send/receive buffer size

It gets forwarded down to UDP.

4 years agortp: Map the urloptions to AVOptions
Luca Barbato [Sun, 22 Mar 2015 17:08:43 +0000 (18:08 +0100)]
rtp: Map the urloptions to AVOptions

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/nvenc: Fix typoed nv_status checks
Timo Rothenpieler [Wed, 1 Apr 2015 07:46:50 +0000 (09:46 +0200)]
avcodec/nvenc: Fix typoed nv_status checks

Thanks to Wyatt Aaron for pointing this out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/png: Clearly separate encoding header and frames
Donny Yang [Tue, 31 Mar 2015 20:58:25 +0000 (20:58 +0000)]
avcodec/png: Clearly separate encoding header and frames

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavu/avstring: add av_append_path_component() funcion
Lukasz Marek [Sat, 5 Jul 2014 16:12:02 +0000 (18:12 +0200)]
lavu/avstring: add av_append_path_component() funcion

Convinient function to build paths.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mp3dec: offset seek index to end of id3v2 tag
wm4 [Tue, 31 Mar 2015 20:47:37 +0000 (22:47 +0200)]
avformat/mp3dec: offset seek index to end of id3v2 tag

The Xing index won't account for the id3 tag - it's relative to the
headers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libx265: export choosen picture types
Michael Niedermayer [Mon, 30 Mar 2015 22:37:46 +0000 (00:37 +0200)]
avcodec/libx265: export choosen picture types

Fixes part of ticket 4285

Reviewed-by Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopng: Clear up the calculation of max packet size
Donny Yang [Tue, 31 Mar 2015 12:37:22 +0000 (12:37 +0000)]
png: Clear up the calculation of max packet size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/internal: Fix doxy for ff_alloc_packet2() return value
Michael Niedermayer [Tue, 31 Mar 2015 14:14:22 +0000 (16:14 +0200)]
avcodec/internal: Fix doxy for ff_alloc_packet2() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovf_drawtext: add support for setting box border width
Marton Balint [Mon, 30 Mar 2015 22:52:47 +0000 (00:52 +0200)]
vf_drawtext: add support for setting box border width

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/http: Fix null check on allocated value
Himangi Saraogi [Tue, 31 Mar 2015 07:23:25 +0000 (12:53 +0530)]
avformat/http: Fix null check on allocated value

probably fixes CID 1292299

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: avoid unnecessary calls to get_format
Rainer Hochecker [Tue, 31 Mar 2015 06:27:01 +0000 (08:27 +0200)]
h264: avoid unnecessary calls to get_format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_detelecine: Fix uninitialized array index error
Himangi Saraogi [Tue, 31 Mar 2015 07:13:46 +0000 (12:43 +0530)]
avfilter/vf_detelecine: Fix uninitialized array index error

Fixes the defect CID 1292301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/segment: style nits
Rodger Combs [Tue, 31 Mar 2015 02:23:19 +0000 (20:23 -0600)]
lavf/segment: style nits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: Check av_frame_ref() return value
Michael Niedermayer [Tue, 31 Mar 2015 02:25:42 +0000 (04:25 +0200)]
avcodec/snowenc: Check av_frame_ref() return value

Fixes CID1026740

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_refs: fix null pointer dereference with -DTRACE
Michael Niedermayer [Mon, 30 Mar 2015 23:57:00 +0000 (01:57 +0200)]
avcodec/h264_refs: fix null pointer dereference with -DTRACE

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
Michael Niedermayer [Mon, 30 Mar 2015 23:02:00 +0000 (01:02 +0200)]
Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
  build: Split JPEG-related tables off into a separate component

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'
Michael Niedermayer [Mon, 30 Mar 2015 22:47:40 +0000 (00:47 +0200)]
Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'

* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
  mjpeg: Use a more precise type for put_marker()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/hmac: Check av_hmac_alloc() return code
Michael Niedermayer [Mon, 30 Mar 2015 21:07:19 +0000 (23:07 +0200)]
avutil/hmac: Check av_hmac_alloc() return code

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