]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 8 Jun 2015 20:05:20 +0000 (22:05 +0200)]
Merge commit '
925b80d64029d41962e5998d7d901226c3a9baea '
* commit '
925b80d64029d41962e5998d7d901226c3a9baea ':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 19:30:05 +0000 (21:30 +0200)]
Merge commit '
9bb11be0e5a75782c3139ad058c2b571499aa37d '
* commit '
9bb11be0e5a75782c3139ad058c2b571499aa37d ':
mpegvideo: Split picture allocation for encoding and decoding
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 7 Jun 2015 16:50:43 +0000 (18:50 +0200)]
vp9: change type of tile_size from unsigned to int64_t
Otherwise the check 'tile_size < size' treats a negative size as
unsigned, causing the check to pass. This subsequently leads to
segmentation faults.
This was originally fixed as part of Libav commit 72ca83, so the
original author is one of the following developers:
Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö <martin@martin.st>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Mon, 8 Jun 2015 19:16:36 +0000 (21:16 +0200)]
Merge commit '
f8716a1408f4f4ec63857b7015fbd62f9eac344a '
* commit '
f8716a1408f4f4ec63857b7015fbd62f9eac344a ':
mpegvideo: Rework frame_size_alloc function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 18:58:13 +0000 (20:58 +0200)]
Merge commit '
da0c8664b4dc906696803685f7e53ade68594ab8 '
* commit '
da0c8664b4dc906696803685f7e53ade68594ab8 ':
mpegvideo: Move various temporary buffers to a separate context
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/vc1_mc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 8 Jun 2015 19:02:30 +0000 (16:02 -0300)]
mpjpegdec: fix memory leak in probe function
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 8 Jun 2015 18:39:38 +0000 (20:39 +0200)]
Merge commit '
a6f19d6a9f8d1e08653d9d77581e8c823f4955c2 '
* commit '
a6f19d6a9f8d1e08653d9d77581e8c823f4955c2 ':
configure: Support MSVC 2015
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 18:16:06 +0000 (20:16 +0200)]
swr: Fix ASSERT_LEVEL warning
Found-by: cehoyos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 16:53:13 +0000 (18:53 +0200)]
avcodec/hq_hqa: Fix signness of tag
Fixes Ticket4509
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Donny Yang [Tue, 2 Jun 2015 15:49:27 +0000 (15:49 +0000)]
avcodec/apng: Add partial support for blending with PAL8 pixel format
Currently restricted to blending pixels that only contain either
0 or 255 in their alpha components
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Donny Yang [Tue, 2 Jun 2015 15:49:26 +0000 (15:49 +0000)]
avcodec/apng: Add support for blending with GRAY8A pixel format
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Donny Yang [Tue, 2 Jun 2015 15:49:25 +0000 (15:49 +0000)]
avcodec/apng: Add blending support for non-alpha pixel formats
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Donny Yang [Sun, 7 Jun 2015 18:12:30 +0000 (18:12 +0000)]
avcodec/apng: Dispose previous frame properly
The spec specifies the dispose operation as how the current (i.e., currently
being rendered) frame should be disposed when the next frame is blended onto it
This is contrary to ffmpeg's current behaviour of interpreting the dispose
operation as how the previous (i.e., already rendered) frame should be disposed
This patch fixes ffmpeg's behaviour to match those of the spec, which involved
a rewrite of the blending function
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Mon, 8 Jun 2015 09:50:48 +0000 (04:50 -0500)]
lavf/tls: let the user specify what name to verify against
This can be useful for debugging, or in scenarios where the user
doesn't want to use the system's DNS settings for whatever reason.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 31 May 2015 13:49:55 +0000 (15:49 +0200)]
mpegvideo: Move OutFormat enum to mpegutils.h
It is necessary to avoid circular header dependencies.
Vittorio Giovara [Sun, 31 May 2015 13:49:54 +0000 (15:49 +0200)]
mpegvideo: Split picture allocation for encoding and decoding
The main ff_alloc_picture() function is made more generic with all the
parameters necessary as arguments. This will allows to move most of the
related functions to a separate file later.
Right now wrappers are provided to try and minimize the number of
changes in the code.
Vittorio Giovara [Sun, 31 May 2015 13:49:53 +0000 (15:49 +0200)]
mpegvideo: Rework frame_size_alloc function
Use more generic arguments and remove its static attribute since it will
be moved to a separate file.
Vittorio Giovara [Sun, 31 May 2015 13:49:52 +0000 (15:49 +0200)]
mpegvideo: Move various temporary buffers to a separate context
Luca Barbato [Fri, 5 Jun 2015 13:07:06 +0000 (15:07 +0200)]
configure: Support MSVC 2015
The C runtime C99 compatibility had been improved a lot and it now
rejects some of the compatibility defines provided for the older
versions.
Many thanks to Ray for the time spent testing.
Bug-Id: 864
CC: libav-stable@libav.org
Michael Niedermayer [Sat, 6 Jun 2015 01:06:12 +0000 (03:06 +0200)]
avformat/mxfenc: Allow overriding /manual setting of the signal standard
previous patch reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Max Poliakovski [Sun, 7 Jun 2015 10:52:06 +0000 (12:52 +0200)]
atrac3plus: give the phase_shift flag a better name.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Max Poliakovski [Sat, 6 Jun 2015 21:28:47 +0000 (23:28 +0200)]
atrac3plus: add support for GHA phase inversion.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 02:00:45 +0000 (04:00 +0200)]
avformat/version: Bump version for single jpeg muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 01:41:57 +0000 (03:41 +0200)]
doc/ffserver: Add entry for missing jpeg variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Caligula useraccount [Mon, 8 Jun 2015 01:32:29 +0000 (03:32 +0200)]
ffserver: Use singlejpeg muxer for jpeg
Fixes Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Caligula useraccount [Mon, 8 Jun 2015 01:28:33 +0000 (03:28 +0200)]
avformat: Add single jpeg muxer
Needed to fix Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jun 2015 00:33:39 +0000 (02:33 +0200)]
avcodec/aacdec: Do not return a uninitialized value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 23:45:54 +0000 (01:45 +0200)]
Merge commit '
bc76c46943272515805d7ac48ca39f14826d1fed '
* commit '
bc76c46943272515805d7ac48ca39f14826d1fed ':
aac: Wait to know the channels before allocating frame
Conflicts:
libavcodec/aacdec.c
See:
676a395ab903cac623c5d6ddd0928c789e08a59e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 23:30:51 +0000 (01:30 +0200)]
Merge commit '
a188108ebf28ebac9d2b8fc7d5b391aef45698b3 '
* commit '
a188108ebf28ebac9d2b8fc7d5b391aef45698b3 ':
aac: Support channel configurations 11 and 12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 23:19:26 +0000 (01:19 +0200)]
Merge commit '
677c804aa3a78d61b21e6423165a252846c20f0e '
* commit '
677c804aa3a78d61b21e6423165a252846c20f0e ':
aac: correctly map 7.1ch-wide AAC from FDK AAC encoder
Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 23:10:11 +0000 (01:10 +0200)]
Merge commit '
252d6200c36e7eaa79f8d5205b7d731179e94897 '
* commit '
252d6200c36e7eaa79f8d5205b7d731179e94897 ':
avio: Add avio_put_str16be
Conflicts:
doc/APIchanges
libavformat/avio.h
libavformat/aviobuf.c
libavformat/version.h
The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 22:44:28 +0000 (00:44 +0200)]
Merge commit '
9b56ac74b170d12027fbc81f581a451a709f1105 '
* commit '
9b56ac74b170d12027fbc81f581a451a709f1105 ':
mpjpeg: Initial implementation
Conflicts:
Changelog
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 22:22:06 +0000 (00:22 +0200)]
avformat/hdsenc: Change duration from single to to double precision
This slightly improves precision
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 19:50:21 +0000 (21:50 +0200)]
avformat/rmenc: Remove float usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 18:39:27 +0000 (20:39 +0200)]
avcodec/libstagefright: Check for pthread_create() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 7 Jun 2015 18:18:15 +0000 (20:18 +0200)]
avfilter: fix a few 5 spaces indent
Michael Niedermayer [Sun, 7 Jun 2015 16:57:55 +0000 (18:57 +0200)]
avdevice/iec61883: Check pthread init for failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 13:00:30 +0000 (15:00 +0200)]
ffserver: Check for ffio_set_buf_size() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 12:57:36 +0000 (14:57 +0200)]
avformat/aviobuf: Check for ffio_set_buf_size() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jun 2015 12:55:10 +0000 (14:55 +0200)]
avformat/ffmdec: Check ffio_set_buf_size() return value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jun 2015 13:34:17 +0000 (15:34 +0200)]
ffserver: Check allocations (likely not all)
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 4 Jun 2015 08:19:50 +0000 (10:19 +0200)]
aac: Wait to know the channels before allocating frame
The channel configuration can be delivered only by the PCE,
try to parse it first and not try to decode until a channel
configuration is set.
CC: libav-stable@libav.org
Sebastian Dröge [Thu, 4 Jun 2015 13:35:51 +0000 (15:35 +0200)]
aac: Support channel configurations 11 and 12
These are defined in ISO/IEC 14496-3:2009/PDAM 4 for 6.1 and 7.1.
It also defines another 7.1 layout with configuration 14, that one
is not added here for now.
11: 3/3.1 FC FL+FR BL+BR BC LFE
12: 3/2/2.1 FC FL+FR SiL+SiR BL+BR LFE
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
nu774 [Thu, 4 Jun 2015 05:42:08 +0000 (14:42 +0900)]
aac: correctly map 7.1ch-wide AAC from FDK AAC encoder
FDK AAC encoder outputs SCE(front)+CPE(front)+CPE(back)+CPE(back) on
MODE_7_1_REAR_SURROUND configuration.
Since decoder couldn't properly map 4 back channels, decoding failed
unless -request_channel_layout 0x8000000000000000 has been specified.
Now we treat first CPE(back) as CPE(side) on channel mapping.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Fri, 5 Jun 2015 21:21:18 +0000 (23:21 +0200)]
avio: Add avio_put_str16be
Luca Barbato [Sat, 16 May 2015 15:03:28 +0000 (17:03 +0200)]
mpjpeg: Initial implementation
Support only streams with Content-Length.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
James Almer [Sun, 7 Jun 2015 04:24:31 +0000 (01:24 -0300)]
fate: add missing avdevice dependency to closed caption test
Signed-off-by: James Almer <jamrial@gmail.com>
Philip Langdale [Sat, 6 Jun 2015 20:21:56 +0000 (13:21 -0700)]
avcodec/allcodecs: Re-order nvenc encoders below x264/5.
We shouldn't pick nvenc by default.
Signed-off-by: Philip Langdale <philipl@overt.org>
Ganesh Ajjanagadde [Fri, 5 Jun 2015 20:05:18 +0000 (16:05 -0400)]
vf_colormatrix: calculate coefficients only once
calc_coefficients is no longer being called every frame
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jun 2015 19:28:54 +0000 (21:28 +0200)]
avcodec/mpegvideo: Use av_memdup() for allocating thread_context
Also check for allocation failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jun 2015 19:25:04 +0000 (21:25 +0200)]
avcodec/mpegvideo: Clear thread_context array before allocating
This is probably redundant but its safer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jun 2015 19:16:10 +0000 (21:16 +0200)]
avcodec/mpegvideo: Merge thread context initialization loops
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Sat, 6 Jun 2015 18:09:15 +0000 (11:09 -0700)]
avcodec/nvenc: Add 'nvenc_h264' as an alternative name for 'nvenc'
This allows us to offer the same codec name that libav uses. We don't have
a special way to do aliases, so it's all a bit more verbose than you'd want
but such is life.
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 6 Jun 2015 18:00:45 +0000 (11:00 -0700)]
avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc
For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 6 Jun 2015 17:42:00 +0000 (10:42 -0700)]
Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation"
This reverts commit
d0d0913702358c61dfb9c5ac8b141cd203524869 .
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 6 Jun 2015 17:41:34 +0000 (10:41 -0700)]
Revert "Merge commit '
b08caa87c35a768ec0abb16b1e99c3a85f1df28e '"
This reverts commit
d8bbb99c51af08c76dd0a66588fecc5c0106844d , reversing
changes made to
d0d0913702358c61dfb9c5ac8b141cd203524869 .
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 6 Jun 2015 17:40:34 +0000 (10:40 -0700)]
Revert "nvenc: remove cuda.h requirement for nvenc_a"
This reverts commit
f10497042f092d56f82f536276d5998d7fd1e4c4 .
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 6 Jun 2015 17:40:21 +0000 (10:40 -0700)]
Revert "avcodec/Makefile: fix checkheaders for nvenc_b"
This reverts commit
3be811a528461816063059377fcb2ac60eabfa77 .
Signed-off-by: Philip Langdale <philipl@overt.org>
Philip Langdale [Sat, 6 Jun 2015 17:40:11 +0000 (10:40 -0700)]
Revert "Changelog: Drop duplicate NVENC entry"
This reverts commit
440fa7758b687bbb0007f85497eed8bb9aec96bd .
Signed-off-by: Philip Langdale <philipl@overt.org>
Michael Niedermayer [Sat, 6 Jun 2015 12:57:15 +0000 (14:57 +0200)]
avutil/colorspace: Remove RGB_TO_Y/U/V
They are unused and colorspace.h is not a installed header
Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 6 Jun 2015 15:56:06 +0000 (15:56 +0000)]
avcodec/exr: fix crash caused by merge
Various header informations need to be reset when decoding next frame.
Regression since:
95582b5c
Fixes ticket #4597.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Sat, 6 Jun 2015 04:55:06 +0000 (01:55 -0300)]
configure: improve the checks for gmtime_r and localtime_r
They are inlined wrapper functions inside the time.h header on MinGW-w64, so
neither check_func() or check_func_headers() work with them.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 6 Jun 2015 12:21:04 +0000 (14:21 +0200)]
Changelog: Drop duplicate NVENC entry
Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 6 Jun 2015 10:59:46 +0000 (12:59 +0200)]
avdevice/x11grab: use av_clip() instead of nested min & max
Note: [xy]_off and screen_[wh] variables are int, as well as
X11GrabContext.{width,height,x_off,y_off}.
Clément Bœsch [Sat, 6 Jun 2015 10:56:57 +0000 (12:56 +0200)]
avcodec/snowenc: use av_clip() instead of nested min & max
Note: AVCodecContext.refs is an int field.
Clément Bœsch [Sat, 6 Jun 2015 10:55:20 +0000 (12:55 +0200)]
avcodec/mpegvideo: use av_clip() instead of nested min & max
Note: MpegEncContext.mb_{y,height} are int fields, as well as local off
variable.
Clément Bœsch [Sat, 6 Jun 2015 10:50:21 +0000 (12:50 +0200)]
ffplay: use av_clip() instead of nested min & max
Note: {wanted,min,max}_samples are int variables.
Ronald S. Bultje [Sat, 6 Jun 2015 02:08:45 +0000 (22:08 -0400)]
hevc: fix typo (mpv -> mvp).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jun 2015 10:34:00 +0000 (12:34 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
lavf/http: Indent else-clause.
lavf/http: Properly process HTTP header on listen.
lavf/http: Rudimentary error handling for HTTP requests received from clients.
lavf/http: Process HTTP header before sending response.
lavf/http: Document method option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 6 Jun 2015 10:16:18 +0000 (12:16 +0200)]
swresample: fix initilaize/initialize typo
Clément Bœsch [Sat, 6 Jun 2015 10:14:42 +0000 (12:14 +0200)]
doc/filters: fix inaccuarte/inaccurate typo
Stephan Holljes [Thu, 4 Jun 2015 22:27:07 +0000 (00:27 +0200)]
lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Wed, 3 Jun 2015 23:21:26 +0000 (01:21 +0200)]
lavf/http: Indent else-clause.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Wed, 3 Jun 2015 23:21:02 +0000 (01:21 +0200)]
lavf/http: Properly process HTTP header on listen.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Wed, 3 Jun 2015 23:20:28 +0000 (01:20 +0200)]
lavf/http: Rudimentary error handling for HTTP requests received from clients.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Wed, 3 Jun 2015 23:17:51 +0000 (01:17 +0200)]
lavf/http: Process HTTP header before sending response.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Wed, 3 Jun 2015 23:16:59 +0000 (01:16 +0200)]
lavf/http: Document method option.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Michael Niedermayer [Fri, 22 May 2015 12:02:51 +0000 (14:02 +0200)]
avformat/mxfenc: Add mxf muxer avclass
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 22:59:16 +0000 (00:59 +0200)]
avcodec/s302m: Only set the sample rate when some data is output
This way ffplay chooses the mp2 stream for Ticket3890
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 22:55:12 +0000 (00:55 +0200)]
avformat/utils: Do not select audio streams with unknown sample rate in av_find_best_stream()
Together with the next commit this prevents non-PCM S302M from being selected unless either
it can be decoded or the user selects passthrough/copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jun 2015 14:41:18 +0000 (16:41 +0200)]
avcodec/s302m: Check for non PCM Streams
Allow the user to choose what to do with the non PCM data through AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ganesh Ajjanagadde [Fri, 5 Jun 2015 18:14:58 +0000 (14:14 -0400)]
flvdec: fix lack of duration for some files
Fixes #4579
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 19:21:44 +0000 (21:21 +0200)]
avformat/flvdec: Show unknown tags at debug level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 19:18:29 +0000 (21:18 +0200)]
avformat/flvdec: Add TYPE_ONCAPTIONINFO
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 19:07:36 +0000 (21:07 +0200)]
avformat/flvdec: increase buffer size for parsing metadata string key
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 18:06:32 +0000 (20:06 +0200)]
Revert addition of a few fixed_dsp functions to APIChanges
The header is not installed currently so the changes should not be in APIChanges
Found-by: Ronald S. Bultje and others
This reverts part of commit
19ed3e35a5cd188de69f3635f56d9e51c2f720d5 .
Michael Niedermayer [Fri, 5 Jun 2015 17:12:58 +0000 (19:12 +0200)]
avutil/ppc/cpu: add include avassert.h
fix build failure on ppc64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 15:39:42 +0000 (17:39 +0200)]
avutil/softfloat: Fix alternative implementation of av_normalize1_sf()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 15:36:46 +0000 (17:36 +0200)]
avutil/softfloat: Fix alternative implementation of av_normalize_sf()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 4 Jun 2015 21:07:44 +0000 (23:07 +0200)]
arm: only enable setend on ARMv6
Without this check it causes SIGILL crashes on ARMv5.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Fri, 5 Jun 2015 11:30:54 +0000 (13:30 +0200)]
avutil/softfloat: Move av_sincos_sf() from header to c file
The function is quite big and trigonometric functions should not really
be used in speed critical code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Fri, 5 Jun 2015 09:54:44 +0000 (11:54 +0200)]
libavutil/doc: Changes in documentation due to changes to fixed_dsp
New functions are added to fixed_dsp, so the documentation is changed
accordingly.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 10:57:06 +0000 (12:57 +0200)]
avutil/softfloat: Add more tests for the normalization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 10:56:12 +0000 (12:56 +0200)]
avutil/softfloat: Fix thresholds in av_normalize_sf()
Found-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jun 2015 02:05:57 +0000 (04:05 +0200)]
avcodec/rdft: Use more specific error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Thu, 4 Jun 2015 23:29:49 +0000 (16:29 -0700)]
lavf/matroskaenc: Write Block Keyframe correctly
Per matroska Block Structure [1], for keyframes 0th bit of the flag
should not be set (unlike SimpleBlocks). For Blocks, keyframes is
inferred by the absence of ReferenceBlock element (as done by
matroskadec). This CL writes the flag correctly and inserts the
ReferenceBlock element for non-keyframes. The timestamp inserted is
that of the immediately preceding frame (which is true for VP8 and VP9
- the only 2 codecs using the matroska block element as of now). It
also considers all non-video frames (audio, subtitles, metadata) to
be keyframes.
[1] http://www.matroska.org/technical/specs/index.html#block_structure
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jun 2015 20:35:31 +0000 (22:35 +0200)]
avcodec/utils: Assert that audio decoders do not report using more data than was input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jun 2015 20:59:34 +0000 (22:59 +0200)]
avcodec/alsdec: Check for overread
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jun 2015 20:47:24 +0000 (22:47 +0200)]
avcodec/atrac3plusdec: consume only as many bytes as available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jun 2015 20:34:12 +0000 (22:34 +0200)]
avcodec/adpcm: Check for overreads
See: vlc ticket 14649
Reported-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>