]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 26 Mar 2015 14:29:54 +0000 (15:29 +0100)]
avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()
This is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Mar 2015 14:29:03 +0000 (15:29 +0100)]
avcodec/ac3dec: Put CONFIG* first in if()
This may fix build failures with EAC3 disabled and is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Mar 2015 02:10:27 +0000 (03:10 +0100)]
avformat/dv: fix used dimension variables
Fixes null pointer dereference during seeking
Fixes Ticket4395
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 26 Mar 2015 01:02:18 +0000 (02:02 +0100)]
avformat/rmdec: fix support for 0 sized mdpr
Fixes Ticket4393
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Himangi Saraogi [Wed, 25 Mar 2015 23:05:28 +0000 (04:35 +0530)]
avfilter/vf_telecine: Fix AV desync by using the first input timestamp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Wed, 25 Mar 2015 22:24:30 +0000 (15:24 -0700)]
avcodec/nvenc: Need a separate class for each encoder
The encoders can't share a class instance.
Signed-off-by: Philip Langdale <philipl@overt.org>
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:31 +0000 (15:23 -0400)]
doc: remove the reference to supporting AviSynth 2.5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:30 +0000 (15:23 -0400)]
avisynth: drop support of AviSynth 2.5
If the user attempts to use AviSynth 2.5, an error message will
now tell them they need to upgrade.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Mar 2015 17:30:00 +0000 (18:30 +0100)]
swscale/output: Fix undefined shifts
Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:32 +0000 (15:23 -0400)]
avisynth: ifdef to avoid implicit function declaration errors
The demuxer doesn't use these functions, so it shouldn't affect
anything. Investigate whether this can be fixed by how headers
are checked in configure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Himangi Saraogi [Wed, 25 Mar 2015 13:32:16 +0000 (19:02 +0530)]
avcodec/j2kenc: Initialize variable to silence compiler warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 23 Mar 2015 15:11:19 +0000 (11:11 -0400)]
avutil: make AVFrameSideData buffers ref-counted.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 23 Mar 2015 15:11:18 +0000 (11:11 -0400)]
lavu/frame: move av_frame_copy_props() up in the file.
Preparation for following patch.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 25 Mar 2015 06:58:13 +0000 (03:58 -0300)]
avcodec/nvenc_h265: add missing version bump and changelog entry
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 25 Mar 2015 06:49:30 +0000 (03:49 -0300)]
configure: add missing dependency for nvenc_h265
Should fix compilation of builds without nvenc
Signed-off-by: James Almer <jamrial@gmail.com>
Philip Langdale [Tue, 24 Mar 2015 04:34:59 +0000 (21:34 -0700)]
avcodec/nvenc: Add support for H.265 encoding
Sufficiently new nvenc hardware (GM20x or later) has support for H.265
encoding. This works the same as the H.264 encoder except the
codec parameters are different.
Due to the fact that common codec parameters are not shareable, there's
quite a bit of conditional logic you'd wish we could do without, but
such is life.
Signed-off-by: Philip Langdale <philipl@overt.org>
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Michael Niedermayer [Wed, 25 Mar 2015 02:45:32 +0000 (03:45 +0100)]
avcodec/h264: Remove bits_per_raw_sample hacks
Fixes assertion failure
Fixes: f12c79769501ee471a5c731b8304ffcb/signal_sigabrt_7ffff6ac8cc9_3766_cov_4267830138_undemuxable_h264.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Tue, 24 Mar 2015 19:23:29 +0000 (15:23 -0400)]
avisynth: update headers against AviSynth+
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Tue, 24 Mar 2015 19:20:45 +0000 (20:20 +0100)]
ffmpeg: fix option name in documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Mar 2015 20:18:42 +0000 (21:18 +0100)]
avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings during parsing
Fixes: AVCI100_Test.mxf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 16:36:39 +0000 (17:36 +0100)]
avutil/pixfmt: Add missing AV_ prefix to PIX_FMT_YUV411P
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timo Rothenpieler [Tue, 24 Mar 2015 09:26:57 +0000 (10:26 +0100)]
avcodec/nvenc: Drop support for old nvenc api
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 14:53:24 +0000 (15:53 +0100)]
avcodec/msrledec: More verbose error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 14:50:12 +0000 (15:50 +0100)]
avcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead of the pixel pointer
Fixes out of array access
Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jochen Strunk [Tue, 24 Mar 2015 09:39:27 +0000 (10:39 +0100)]
avformat/mov: check color parameter type explicitly.
Fixes ticket #4387.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Note, Vittorio Giovara had submitted a very similar fix to me privately
a few hours before this, iam applying Jochens because it comes with a
commit message too and i had not yet applied Vittorios, but For sake
of credit, Vittorio independently solved this first
Michael Niedermayer [Tue, 24 Mar 2015 11:47:13 +0000 (12:47 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 10:54:38 +0000 (11:54 +0100)]
Merge commit '
1188119624e42c1b2ce5be6137d2e6c6f4f03328 '
* commit '
1188119624e42c1b2ce5be6137d2e6c6f4f03328 ':
avisynth: update documentation about the avisynth_c.h header
Conflicts:
doc/general.texi
Not merged as FFmpeg provides the needed headers in compat/
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 10:24:21 +0000 (11:24 +0100)]
Merge commit '
a8c99205ca8703bd849efae13fcf844315c7147d '
* commit '
a8c99205ca8703bd849efae13fcf844315c7147d ':
avisynth: Fix compilation against current 2.6 header(s).
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Fri, 13 Mar 2015 02:52:30 +0000 (22:52 -0400)]
avisynth: update documentation about the avisynth_c.h header
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stephen Hutchinson [Fri, 13 Mar 2015 02:52:29 +0000 (22:52 -0400)]
avisynth: Fix compilation against current 2.6 header(s).
AviSynth 2.6 (and by extension, AviSynth+) moves these functions
into AVSC_API. This requires both adjusting their normal use,
and for AvxSynth, adjusting the position/use of the USING_AVISYNTH
ifdefs.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Carl Eugen Hoyos [Mon, 23 Mar 2015 23:04:43 +0000 (00:04 +0100)]
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Fixes remuxing of DVBSUB to mkv.
Carl Eugen Hoyos [Tue, 24 Mar 2015 08:53:29 +0000 (09:53 +0100)]
doc: Remove non-existing decklink options.
Reported-by: Bostjan Hamler
Michael Niedermayer [Tue, 24 Mar 2015 01:47:50 +0000 (02:47 +0100)]
Michael Niedermayer [Tue, 24 Mar 2015 01:30:47 +0000 (02:30 +0100)]
Merge commit '
ae4f5d944cce431b1f4715c863122355e1d78007 '
* commit '
ae4f5d944cce431b1f4715c863122355e1d78007 ':
dxva2_h264: fix slice offset in long slice structs
See:
cf1fba0fb83ba4d6ddd0a2432ea5e5e6f8c10aa2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 01:06:44 +0000 (02:06 +0100)]
Merge commit '
b21af32aed7e343f962753943e9f16baedfb1750 '
* commit '
b21af32aed7e343f962753943e9f16baedfb1750 ':
lavc: Prefer x264 over openh264 if both libraries are available
See:
ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:55:19 +0000 (01:55 +0100)]
Merge commit '
312a9ef04bf6b55e68e4a61694b169cd3cc69bb8 '
* commit '
312a9ef04bf6b55e68e4a61694b169cd3cc69bb8 ':
pixfmt: Update documentation with prefixed pixel formats
Conflicts:
libavutil/pixfmt.h
See:
231e33f050386e170cba33188df7b822b16ca099
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:45:43 +0000 (01:45 +0100)]
Merge commit '
592a04054e6423be5050efd2bceece48b10b9c1d '
* commit '
592a04054e6423be5050efd2bceece48b10b9c1d ':
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Conflicts:
libavutil/pixdesc.c
See:
c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:24:04 +0000 (01:24 +0100)]
Merge commit '
7419b34825c20d52f667da2fbe4dc710ec8398f8 '
* commit '
7419b34825c20d52f667da2fbe4dc710ec8398f8 ':
fate: Add test for tscc2 in mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:14:31 +0000 (01:14 +0100)]
Merge commit '
e4fe535d12f4f30df2dd672e30304af112a5a827 '
* commit '
e4fe535d12f4f30df2dd672e30304af112a5a827 ':
mov: Write the display matrix in order
Conflicts:
libavformat/mov.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Sat, 21 Mar 2015 23:45:27 +0000 (16:45 -0700)]
libavformat/mxfenc: add container duration and package name to primer pack
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 23 Mar 2015 13:16:45 +0000 (14:16 +0100)]
vaapi_h264: fix slice data offset
Hendrik Leppkes [Mon, 23 Mar 2015 13:16:44 +0000 (14:16 +0100)]
dxva2_h264: fix slice offset in long slice structs
Michael Niedermayer [Tue, 17 Mar 2015 14:16:58 +0000 (14:16 +0000)]
lavc: Prefer x264 over openh264 if both libraries are available
Vittorio Giovara [Wed, 18 Mar 2015 11:10:40 +0000 (11:10 +0000)]
pixfmt: Update documentation with prefixed pixel formats
Vittorio Giovara [Wed, 18 Mar 2015 11:10:39 +0000 (11:10 +0000)]
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Vittorio Giovara [Wed, 18 Mar 2015 00:48:18 +0000 (00:48 +0000)]
fate: Add test for tscc2 in mov
Rename the existing tscc2 test.
Vittorio Giovara [Tue, 17 Mar 2015 17:38:48 +0000 (17:38 +0000)]
mov: Write the display matrix in order
This will allow to copy the matrix as is and it is just cleaner to keep
the matrix in the same order specified by the mov standard (which is
also explicitly described in the documentation).
In order to preserve compatibility, flip the angle sign in the display API
av_display_rotation_set() and av_display_rotation_get(), and improve the
documentation mentioning the rotation direction.
Michael Niedermayer [Mon, 23 Mar 2015 19:33:09 +0000 (20:33 +0100)]
Merge commit '
e0046bc9c96150fa06146ace9093f06857dd7b23 '
* commit '
e0046bc9c96150fa06146ace9093f06857dd7b23 ':
movenc: Write the make and model metadata keys for mov style files
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
avfilter/vf_stereo3d: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Mar 2015 17:34:30 +0000 (18:34 +0100)]
avutil/frame: Add some very basic documentation for AVFrameSideData
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 23 Mar 2015 03:47:19 +0000 (20:47 -0700)]
doc: Use @lisp where appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 23 Mar 2015 03:47:18 +0000 (20:47 -0700)]
doc: More semantic markup using @samp and @var where appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 23 Mar 2015 14:58:27 +0000 (15:58 +0100)]
vaapi_h264: fix slice data offset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 23 Mar 2015 14:58:26 +0000 (15:58 +0100)]
dxva2_h264: fix slice offset in long slice structs
Fixes Ticket #4384
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 23 Mar 2015 03:47:16 +0000 (20:47 -0700)]
doc/fate: better formatting
The initial spaces get ignored anyway so let's be consistent with other docs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 21 Nov 2014 22:53:42 +0000 (00:53 +0200)]
movenc: Write the make and model metadata keys for mov style files
These are essential allowing QuickTime to keep detecting content
as slow-motion - this allows preserving them on stream copy.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 22 Mar 2015 23:41:41 +0000 (00:41 +0100)]
postproc/postprocess_template: split 2nd blockgroup loop out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:26:42 +0000 (00:26 +0100)]
postproc/postprocess_template: split first part of block loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:24:46 +0000 (00:24 +0100)]
postproc/postprocess_template: Move QP initialization down
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:22:43 +0000 (00:22 +0100)]
postproc/postprocess_template: Remove dead code and comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:16:07 +0000 (00:16 +0100)]
bpostproc/postprocess_template: drop avoidable #ifdef
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:02:51 +0000 (00:02 +0100)]
postproc/postprocess_template: split loop in 2 (block groups of 4, blocks)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 22:07:03 +0000 (23:07 +0100)]
avcodec/snow: fix support for odd dimensions
Fixes Ticket3914
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 19:31:03 +0000 (20:31 +0100)]
avcodec/jpeglsdec: support PAL1-PAL7
Fixes Ticket3933
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 16:31:34 +0000 (17:31 +0100)]
avfilter/vf_signalstats: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 16:23:38 +0000 (17:23 +0100)]
avfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 16:19:25 +0000 (17:19 +0100)]
Revert "avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer"
This commit has no known use case ATM as there are no unsupported video codecs in flv and could
theoretically be use to generate broken files allthough that would be not entirely easy as
tags/codecs still get sanity checked
This reverts commit
76f4b117807c30a528539fc5c7a7e35cb288cfcf .
Michael Niedermayer [Fri, 6 Mar 2015 01:51:14 +0000 (02:51 +0100)]
avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer
This allows stream copying video codecs before they are explicitly
supported. The same feature was in the past useful for audio codecs
in flv
This partly reverts the changes from
735ab7c5e04e2316afbd56643c13de17a7ac89cd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 13:30:51 +0000 (14:30 +0100)]
avcodec/h264_cavlc: Drop local_ref_count
This basically switches to the implementation from
f6f7d1504134683c435e2c7d804279d982e52bb4
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 13:17:59 +0000 (14:17 +0100)]
avcodec/h264_cabac: Drop local_ref_count
7966 -> 7897 decicycles
This basically switches to the implementation from
f6f7d1504134683c435e2c7d804279d982e52bb4
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 03:03:06 +0000 (04:03 +0100)]
Merge commit '
cfe64613923a2d47644a87386146ada1f9f6b659 '
* commit '
cfe64613923a2d47644a87386146ada1f9f6b659 ':
avfilter: Document avfilter_graph_alloc return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 03:00:56 +0000 (04:00 +0100)]
Merge commit '
27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f '
* commit '
27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f ':
oggdec: Check memory allocation
Conflicts:
libavformat/oggdec.c
See:
9b8152bf047bbebe4495b993258591687bcdd36d an others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 02:52:17 +0000 (03:52 +0100)]
Merge commit '
93c1b04abfc0dd31211a18bf2c0041d69cd16919 '
* commit '
93c1b04abfc0dd31211a18bf2c0041d69cd16919 ':
mms: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 02:51:49 +0000 (03:51 +0100)]
Merge commit '
d450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7 '
* commit '
d450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7 ':
avplay: Check memory allocation
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 02:48:25 +0000 (03:48 +0100)]
Michael Niedermayer [Sun, 22 Mar 2015 02:40:17 +0000 (03:40 +0100)]
Merge commit '
7ebb3022297aa00afda6800105684b8303f2608e '
* commit '
7ebb3022297aa00afda6800105684b8303f2608e ':
swscale: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 23:27:32 +0000 (00:27 +0100)]
avcodec/h264.h: Drop unused macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 22:45:46 +0000 (23:45 +0100)]
avcodec/h264_slice: update slice context linesizes when a new picture is allocated
previously they where only updated when decoding started and would thus have
been inconsistent for a longer period of time leaving more chances for
problems
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:57 +0000 (10:44 +0000)]
avfilter: Document avfilter_graph_alloc return value
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:59 +0000 (10:44 +0000)]
oggdec: Check memory allocation
Bug-Id: CID
1257798 / CID
1257805
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:58 +0000 (10:44 +0000)]
mms: Check memory allocation
Bug-Id: CID
1258462
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:56 +0000 (10:44 +0000)]
avplay: Check memory allocation
Bug-Id: CID
1288294
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:45:00 +0000 (10:45 +0000)]
rmenc: Check memory allocation
Bug-Id: CID
1257832
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:45:01 +0000 (10:45 +0000)]
swscale: Check memory allocation
Bug-Id: CID
1267890
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 21 Mar 2015 22:16:36 +0000 (23:16 +0100)]
Merge commit '
c28ed1d743443e783537d279ae721be3bbdf7646 '
* commit '
c28ed1d743443e783537d279ae721be3bbdf7646 ':
h264: move [uv]linesize to the per-slice context
Conflicts:
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 22:13:25 +0000 (23:13 +0100)]
Merge commit '
b53569e0681ff7bc99103ab4c961dbac3cc0fce6 '
* commit '
b53569e0681ff7bc99103ab4c961dbac3cc0fce6 ':
h264_cabac: remove now unnecessary H264Context function parameters
Conflicts:
libavcodec/h264_cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 21:08:19 +0000 (22:08 +0100)]
Merge commit '
a12d3188cbec15e22070e139fa5cc541da07e2c3 '
* commit '
a12d3188cbec15e22070e139fa5cc541da07e2c3 ':
h264: use a smaller struct for the ref lists
Conflicts:
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 20:43:03 +0000 (21:43 +0100)]
Merge commit '
94295106d20b32666a8c4e0d028ef79b9d3f3b7a '
* commit '
94295106d20b32666a8c4e0d028ef79b9d3f3b7a ':
h264_mb: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 20:42:10 +0000 (21:42 +0100)]
Merge commit '
2b4c38d3c647f409080606ef02b3363ada00be2c '
* commit '
2b4c38d3c647f409080606ef02b3363ada00be2c ':
h264: drop some mpegvideo remnants from draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 20:41:17 +0000 (21:41 +0100)]
Merge commit '
5bf3c0fa49afd5bbf43aa841ff78007d72c80736 '
* commit '
5bf3c0fa49afd5bbf43aa841ff78007d72c80736 ':
h264: drop the now unused per-slice H264Contexts
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 20:33:27 +0000 (21:33 +0100)]
Merge commit '
51d8725a6e4c7f989d6f0f38b59cb54a2d72846c '
* commit '
51d8725a6e4c7f989d6f0f38b59cb54a2d72846c ':
h264: use the main H264Context as the parent for all slice contexts
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 19:22:34 +0000 (20:22 +0100)]
Merge commit '
92e0b7342c0490894cbcea4461380321e0569de2 '
* commit '
92e0b7342c0490894cbcea4461380321e0569de2 ':
h264_slice: constify all the uses of H264Context during slice decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 21 Mar 2015 20:12:48 +0000 (17:12 -0300)]
vp9: make above buffer pointer 32-byte aligned.
Fixes ticket #4383
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 21 Mar 2015 19:10:49 +0000 (20:10 +0100)]
Merge commit '
3178f4d33ff62243f7cdddb081db516ea34396c9 '
* commit '
3178f4d33ff62243f7cdddb081db516ea34396c9 ':
h264: move rbsp_buffer into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 19:00:34 +0000 (20:00 +0100)]
Merge commit '
582683b6ac798ed2a004a4e2121b7bd47892bbfd '
* commit '
582683b6ac798ed2a004a4e2121b7bd47892bbfd ':
h264: move remaining ER stuff into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 18:28:56 +0000 (19:28 +0100)]
avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 18:24:03 +0000 (19:24 +0100)]
avcodec/error_resilience: Fix mbskip_table==NULL codepath
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 18:03:04 +0000 (19:03 +0100)]
Merge commit '
5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04 '
* commit '
5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04 ':
error_resilience: do not require mbintra/skip tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:58:59 +0000 (18:58 +0100)]
Merge commit '
c377e04d8aa74d030672e9a4788a700b0695fc14 '
* commit '
c377e04d8aa74d030672e9a4788a700b0695fc14 ':
h264: move top_borders into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:47:19 +0000 (18:47 +0100)]
Merge commit '
36d04801ba9d8622c2d759c172aea18561bac74d '
* commit '
36d04801ba9d8622c2d759c172aea18561bac74d ':
h264: move the scratch buffers into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>