]>
git.sesse.net Git - ffmpeg/log
foo86 [Sat, 16 Jan 2016 08:07:08 +0000 (11:07 +0300)]
avcodec/dca: remove old decoder
Remove all files and functions which are not going to be reused,
and disable all functions and FATE tests temporarily which will be.
Derek Buitenhuis [Sun, 31 Jan 2016 16:06:40 +0000 (16:06 +0000)]
fate/ffm: Update test ref
Since timecode_frame)start is a private option now, it stays at the default,
and is no longer written to the file.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 31 Jan 2016 13:24:50 +0000 (13:24 +0000)]
Merge commit '
243df1351d2d928caa084a5704ed783f0b83f072 '
* commit '
243df1351d2d928caa084a5704ed783f0b83f072 ':
lavc: Move {min,max}_prediction_order to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 31 Jan 2016 13:19:50 +0000 (13:19 +0000)]
Merge commit '
936f0d98f864f9f6bb4f9e5458b78537e146bacd '
* commit '
936f0d98f864f9f6bb4f9e5458b78537e146bacd ':
lavc: Move rtp_payload_size to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sun, 31 Jan 2016 12:28:04 +0000 (12:28 +0000)]
Merge commit '
d749615333084e62c9fcc480d1ae466369fdf14f '
* commit '
d749615333084e62c9fcc480d1ae466369fdf14f ':
lavc: Move timecode_frame_start to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Sun, 31 Jan 2016 11:59:28 +0000 (12:59 +0100)]
avcodec/fraps: remove superfluous "Fraps:" from av_log
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 31 Jan 2016 10:21:58 +0000 (11:21 +0100)]
doc/filters.texi: fix typo in spectrumsynth example
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 31 Jan 2016 03:10:02 +0000 (04:10 +0100)]
avcodec/rawdec: Switch to monowhite if there is no palette & bpp=1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 30 Jan 2016 21:01:16 +0000 (22:01 +0100)]
avformat/format: Weight the filename extension higher if there is nearly no data after an ID3 available
Fixes Ticket5205
Based-on-patch-by: Carl Eugen Hoyos
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 30 Jan 2016 20:48:16 +0000 (21:48 +0100)]
avformat/format: Replace nodat by enum
This makes the code much more readable
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kieran Kunhya [Sat, 30 Jan 2016 18:09:36 +0000 (18:09 +0000)]
avcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi
Kieran Kunhya [Sat, 30 Jan 2016 17:39:48 +0000 (17:39 +0000)]
avcodec: Cineform HD Decoder
Decodes YUV 4:2:2 10-bit and RGB 12-bit files.
Older files with more subbands, skips, Bayer, alpha not supported.
Alpha requires addition of GBRAP12 pixel format.
Carl Eugen Hoyos [Sat, 30 Jan 2016 12:38:16 +0000 (13:38 +0100)]
lavc/exr: Move setting SAR down.
Fixes a theoretical issue if the resolution attribute is written
behind the aspect attribute.
Carl Eugen Hoyos [Sat, 30 Jan 2016 12:31:44 +0000 (13:31 +0100)]
lavc/v210dec: Allow odd width.
The rightmost column is not decoded correctly.
Fixes a part of ticket #5195.
Carl Eugen Hoyos [Sat, 30 Jan 2016 12:30:29 +0000 (13:30 +0100)]
Changelog: Sanitize Common Encryption entries.
Clément Bœsch [Sat, 30 Jan 2016 12:10:11 +0000 (13:10 +0100)]
lavc/utils: fix instanciate/instantiate typo
Clément Bœsch [Sat, 30 Jan 2016 12:08:37 +0000 (13:08 +0100)]
lavf/vqf: fix suported/supported typo
Stephen Hutchinson [Wed, 27 Jan 2016 00:10:01 +0000 (19:10 -0500)]
libx265: Remove experimental flag when encoding 4:2:2 and 4:4:4
4:2:2 and 4:4:4 support in the HEVC standard was approved in
October 2014 as part of HEVC Version 2 and published in
January 2015:
http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=12296
http://www.itu.int/rec/T-REC-H.265-201410-S
https://hevc.hhi.fraunhofer.de/rext
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kieran Kunhya [Sat, 30 Jan 2016 01:23:33 +0000 (17:23 -0800)]
avcodec: Remove libvo-aacenc support.
The internal encoder is superior to libvo-aacenc.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Sun, 24 Jan 2016 17:49:12 +0000 (09:49 -0800)]
avcodec: Remove libaacplus
TODO: bump minor
It's inferior in quality to fdk-aac and has an arguably more problematic
license.
As early as 2012, a HydrogenAudio user reported:
> It has however one huge advantage: much better quality at low bitrates than
> faac and libaacplus.
(https://hydrogenaud.io/index.php?PHPSESSID=ckiq394pdglka0kj2fin6ij8t7&topic=95989.msg804633#msg804633)
I myself have made a few spectrograms for a comparison of the two
encoders as well. The FDK output is consistently better than the
libaacplus one, in all bitrates I tested.
libaacplus license is 3GPP + LGPLv2. 3GPP copyright notice is completely
proprietory, as follows:
> No part may be reproduced except as authorized by written permission.
>
> The copyright and the foregoing restriction extend to reproduction in
> all media.
>
> © 2008, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC).
>
> All rights reserved.
(The latest 26410-d00 zip from 3GPP has the same notice, but the copyright
year is changed to 2015)
The copyright part of the FDK AAC license (section 2) is a copyleft
license that permits redistribution under certain conditions (and
therefore the LGPL + libfdk-aac combination is not prohibited by
configure):
> Redistribution and use in source and binary forms, with or without
> modification, are permitted without payment of copyright license fees
> provided that you satisfy the following conditions:
>
> You must retain the complete text of this software license in
> redistributions of the FDK AAC Codec or your modifications thereto in
> source code form.
>
> You must retain the complete text of this software license in the
> documentation and/or other materials provided with redistributions of
> the FDK AAC Codec or your modifications thereto in binary form.
>
> You must make available free of charge copies of the complete source
> code of the FDK AAC Codec and your modifications thereto to recipients
> of copies in binary form.
>
> The name of Fraunhofer may not be used to endorse or promote products
> derived from this library without prior written permission.
>
> You may not charge copyright license fees for anyone to use, copy or
> distribute the FDK AAC Codec software or your modifications thereto.
>
> Your modified versions of the FDK AAC Codec must carry prominent
> notices stating that you changed the software and the date of any
> change. For modified versions of the FDK AAC Codec, the term
> "Fraunhofer FDK AAC Codec Library for Android" must be replaced by the
> term "Third-Party Modified Version of the Fraunhofer FDK AAC Codec
> Library for Android."
James Almer [Mon, 18 Jan 2016 21:37:55 +0000 (18:37 -0300)]
avcodec/proresdec_lgpl: use av_mod_uintp2
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 18 Jan 2016 21:37:36 +0000 (18:37 -0300)]
avcodec/pngdec: use av_mod_uintp2
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 18 Jan 2016 21:36:48 +0000 (18:36 -0300)]
avcodec/amrwbdec: use av_mod_uintp2
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Thierry Foucu [Fri, 29 Jan 2016 18:47:49 +0000 (10:47 -0800)]
lavf/flvdec: Allow files where the PreviousTagSize is not set according to the spec.
Some muxer use the FLV field PreviousTagSize to be the sum of tag
length. Without this change, the flv demuxer think the file is broken
and the re-sync will fail.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hagen Schmidt [Tue, 15 Dec 2015 07:00:48 +0000 (08:00 +0100)]
mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS
Fixes ticket 279.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhao Zhili [Wed, 27 Jan 2016 03:00:17 +0000 (11:00 +0800)]
libavformat/network: use defined constant in poll
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 28 Jan 2016 22:49:06 +0000 (23:49 +0100)]
avformat/avio: free url/avio options
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Neil Birkbeck [Tue, 26 Jan 2016 22:14:20 +0000 (14:14 -0800)]
libavutil/mastering_display_metadata.h: change fields to be rationals as this is how they are typically coded.
(this structure is not referenced anywhere yet)
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Fri, 29 Jan 2016 16:57:15 +0000 (13:57 -0300)]
avcodec/dvaudio: add missing header include
Should fix make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Mats Peterson [Thu, 28 Jan 2016 05:15:29 +0000 (06:15 +0100)]
lavc/rawdec: Use AV_PIX_FMT_PAL8 for raw 1 bpp video in AVI
From
https://msdn.microsoft.com/en-us/library/windows/desktop/
dd318229 %28v=vs.85%29.aspx:
"If biCompression equals BI_RGB and the bitmap uses 8 bpp or less, the
bitmap has a color table immediatelly following the BITMAPINFOHEADER
structure. The color table consists of an array of RGBQUAD values. The
size of the array is given by the biClrUsed member. If biClrUsed is
zero, the array contains the maximum number of colors for the given
bitdepth; that is, 2^biBitCount colors."
Nothing about "monochrome" here. Unfortunately, pal8 to monow conversion
seems a bit flaky, but that's another story.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Ira Krufky [Fri, 29 Jan 2016 11:49:46 +0000 (06:49 -0500)]
libavdevice/decklink_common.h: fix broken build due to missing `/`
Signed-off-by: Michael Ira Krufky <mkrufky@linuxtv.org>
Michael Niedermayer [Fri, 29 Jan 2016 10:27:43 +0000 (11:27 +0100)]
avcodec/huffyuvenc: Remove duplicate include
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Stefano Sabatini [Wed, 27 Jan 2016 11:46:36 +0000 (12:46 +0100)]
ffmpeg: replace "flush Media" with "flush_media" in benchmark_all output
Simplify parsing and consistency.
Timothy Gu [Fri, 29 Jan 2016 02:32:47 +0000 (18:32 -0800)]
amrwbdec_mips: Add missing ff_ prefix
Timothy Gu [Fri, 29 Jan 2016 02:00:33 +0000 (18:00 -0800)]
all: Add missing header guards
Marton Balint [Thu, 14 Jan 2016 02:34:57 +0000 (03:34 +0100)]
configure: remove libzvbi GPL dependency
The COPYING.LIB file in the zvbi source tree as well as libzvbi.h references
the GNU Library General Public License version 2 since version 0.2.28.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 12 Jan 2016 02:09:37 +0000 (03:09 +0100)]
lavd/decklink_dec: add support for teletext
It uses the libzvbi slicer, therefore teletext capture requires libzvbi.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 10 Jan 2016 03:08:12 +0000 (04:08 +0100)]
configure: use -ldl for decklink
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Fri, 29 Jan 2016 00:40:54 +0000 (01:40 +0100)]
lavf: bump micro version after the new segment muxer options
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Mon, 18 Jan 2016 00:29:06 +0000 (01:29 +0100)]
lavf/segment: add new option segment_clocktime_wrap_duration
This option can force the segmenter to only start a new segment if a packet
reaches the muxer within the specified duration after the segmenting clock
time, which makes it more resilient to backward local time jumps, such as leap
seconds or transition to standard time from daylight savings time.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 13 Jan 2016 00:44:36 +0000 (01:44 +0100)]
lavf/segment: add support for specifying clock time offset
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Vittorio Giovara [Thu, 28 Jan 2016 16:38:27 +0000 (11:38 -0500)]
libx264: Make sure to preserve default option values
The private options chromaoffset, sc_threshold, and noise_reduction
were set to 0 rather than -1, and were always initializing values
in libx264 rather than letting the library use its default.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 28 Jan 2016 17:10:34 +0000 (18:10 +0100)]
avcodec/libx264: Fix sc_threshold after
30c1bdb87ce336f2b9957769e30a10d72f93d372
After the merge the default threshold was unconditionally overwritten
A similar fix was written by Vittorio Giovara, but i didnt see that before
i wrote this and it also doesnt apply cleanly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Thu, 28 Jan 2016 17:19:06 +0000 (17:19 +0000)]
avcodec/frame_thread_encoder: Check the private option for huffy's context modelling
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 16:54:26 +0000 (16:54 +0000)]
Merge commit '
96c373c7704aeb1cc1d2c275fbb5d71777665589 '
* commit '
96c373c7704aeb1cc1d2c275fbb5d71777665589 ':
lavc: Move context_model to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 16:44:59 +0000 (16:44 +0000)]
Merge commit '
12b49769223234673db1003d9c43e7483ceb0282 '
* commit '
12b49769223234673db1003d9c43e7483ceb0282 ':
lavc: Move mpeg_quant to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 16:38:04 +0000 (16:38 +0000)]
Merge commit '
1482aff2048511b821ff9feac19426113cc641a2 '
* commit '
1482aff2048511b821ff9feac19426113cc641a2 ':
lavc: Move noise_reduction to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
James Almer [Thu, 28 Jan 2016 16:32:53 +0000 (13:32 -0300)]
x86/imdct36: use extractps inside the STORE macro
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
wm4 [Thu, 28 Jan 2016 16:24:53 +0000 (17:24 +0100)]
mmaldec: limit internal buffering
This uses a new MMAL feature, which limits the number of extra frames
that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can
be defined as positive or negative number. Positive numbers are
absolute, and can lead to deadlocks if the user underestimates the
number of required buffers. Negative numbers specify the number of extra
buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers.
Set a gratuitous default of -11 (N=10). This is much lower than the
firmware default, which appears to be 96.
This is backwards compatible, but needs a symbol only present in newer
firmware headers. (It's an enum item, so it requires a check in
configure.)
wm4 [Thu, 28 Jan 2016 16:24:40 +0000 (17:24 +0100)]
mmaldec: support MPEG-4
I guess this means part 2 in both cases. Not sure which profiles exactly
are actually supported properly.
wm4 [Thu, 28 Jan 2016 16:23:46 +0000 (17:23 +0100)]
mmaldec: print the MMAL format FourCC automatically
Slight simplification. The result is the same. Also, change the
wording of the message as requested in patch review.
wm4 [Thu, 28 Jan 2016 16:23:23 +0000 (17:23 +0100)]
configure: fix mmal build dependencies
The mmal decoders do not depend on the software decoders.
Derek Buitenhuis [Thu, 28 Jan 2016 15:36:06 +0000 (15:36 +0000)]
snow: Move scenechange_threshold to a private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 15:24:00 +0000 (15:24 +0000)]
Merge commit '
7c79587d7407dab4b9445d66b5f111fe657c8c4d '
* commit '
7c79587d7407dab4b9445d66b5f111fe657c8c4d ':
lavc: Move scenechange_threshold to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 15:21:21 +0000 (15:21 +0000)]
Merge commit '
5764d38173661c29d954711dd5abfddf709e9ba4 '
* commit '
5764d38173661c29d954711dd5abfddf709e9ba4 ':
lavc: Move chromaoffset to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 15:08:10 +0000 (15:08 +0000)]
Merge commit '
0ac9f33a9e69c64eee592791be3c5441a6a3d6b7 '
* commit '
0ac9f33a9e69c64eee592791be3c5441a6a3d6b7 ':
lavc: Move frame_skip_* to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Thu, 28 Jan 2016 14:21:33 +0000 (14:21 +0000)]
Merge commit '
84c4714f397c9c50eb9d49008cc1c08385f68f31 '
* commit '
84c4714f397c9c50eb9d49008cc1c08385f68f31 ':
lavc: Move brd_scale to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Wed, 27 Jan 2016 13:37:09 +0000 (14:37 +0100)]
avcodec: add dvaudio parser
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Matthieu Bouron [Wed, 27 Jan 2016 20:59:14 +0000 (21:59 +0100)]
lavc/mjpegdec: use ptrdiff_t instead of ssize_t
Fixes build on msvc.
Michael Niedermayer [Thu, 28 Jan 2016 02:18:20 +0000 (03:18 +0100)]
avcodec/h264: Fix memleak in case of ff_h264_decode_extradata() failure
Fixes Ticket5139
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Wed, 27 Jan 2016 23:49:41 +0000 (23:49 +0000)]
qsvenc: Fix b_strategy typo
This was introduced in
0e6c8532215790bbe560a9eea4f3cc82bb55cf92 .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Rostislav Pehlivanov [Wed, 27 Jan 2016 23:55:24 +0000 (23:55 +0000)]
FATE: update AAC encoder PNS test target
Test target hasn't been updated with the latest changes.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 21:12:04 +0000 (21:12 +0000)]
libavcodec/util: Fix timebase overflow check
It could accidentally divide by zero if num was zero.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
James Almer [Wed, 27 Jan 2016 20:56:35 +0000 (17:56 -0300)]
configure: fix openssl pkg-config check
Signed-off-by: James Almer <jamrial@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 20:32:12 +0000 (20:32 +0000)]
configure: Revert recent changes to disable-everything
These will be re-merged once it's been fixed properly.
This reverts:
* Commit '
8e7bea6dc6ac5b21484774a026847bec0771ab62 '
configure: Improve requesting specific features
* Commit '
e93aa2c9e7b3599aee6a5820760fc1a2c629dea0 '
configure: Force-enable select_any dependencies only on --enable
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 20:27:25 +0000 (20:27 +0000)]
avcodec/version: Add missing #endif
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 20:18:04 +0000 (20:18 +0000)]
Merge commit '
0e6c8532215790bbe560a9eea4f3cc82bb55cf92 '
* commit '
0e6c8532215790bbe560a9eea4f3cc82bb55cf92 '
lavc: Move b_frame_strategy and b_sensitivity to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 20:09:11 +0000 (20:09 +0000)]
Merge commit '
55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c '
This is a NOOP.
* commit '
55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c ':
riff: add C210 FourCC (Canopus C210)
riff: add YUYV FourCC (Drastic YUYV)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 20:06:01 +0000 (20:06 +0000)]
Merge commit '
d43a165bda0eae95f4c7a168c7d13d94966c1a09 '
* commit '
d43a165bda0eae95f4c7a168c7d13d94966c1a09 ':
imgconvert: Add the proper API guards to a deprecated function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 20:02:01 +0000 (20:02 +0000)]
Merge commit '
f7168d7016f7d1034ec90223fa91a90711704e11 '
* commit '
f7168d7016f7d1034ec90223fa91a90711704e11 ':
imgconvert: Move AVPicture-related static function to the deprecated section
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:58:35 +0000 (19:58 +0000)]
Merge commit '
892f037c55d86ce36f8705fbeab052189312a13e '
* commit '
892f037c55d86ce36f8705fbeab052189312a13e ':
imgconvert: Move the shrink functions only where needed
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:56:44 +0000 (19:56 +0000)]
Merge commit '
9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6 '
* commit '
9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6 ':
imgconvert: Drop outdated comment block
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:52:48 +0000 (19:52 +0000)]
Merge commit '
e93aa2c9e7b3599aee6a5820760fc1a2c629dea0 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:51:54 +0000 (19:51 +0000)]
Merge commit '
65d29dd274a302131e2e4bc6d2b1eca4a093900c '
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:49:16 +0000 (19:49 +0000)]
Merge commit '
883ad2c59ceea1ced5495b5ccc83695ed4bbb94b '
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:48:09 +0000 (19:48 +0000)]
Merge commit '
8e7bea6dc6ac5b21484774a026847bec0771ab62 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:41:36 +0000 (19:41 +0000)]
Merge commit '
e9175634ec96e36873929637491189150cfce9ec '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:40:50 +0000 (19:40 +0000)]
Merge commit '
472d488ebcc53bea4cdb124edb94558e72d8f23f '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:39:52 +0000 (19:39 +0000)]
Merge commit '
7486418683bd2477772e03aab573cf846c12fb0d '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:33:32 +0000 (19:33 +0000)]
Merge commit '
e59708bb9d94f67381f19344b5e021591eb711bf '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:32:39 +0000 (19:32 +0000)]
Merge commit '
c4de754d4dac5ddae4d5a6f02798c0f560771921 '
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 19:30:08 +0000 (19:30 +0000)]
Merge commit '
8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Matthieu Bouron [Tue, 26 Jan 2016 16:15:37 +0000 (17:15 +0100)]
lavc/mjpegdec: speed up scan data copy
Derek Buitenhuis [Wed, 27 Jan 2016 18:32:28 +0000 (18:32 +0000)]
Merge commit '
e4eb13ca77624401ea7cef1ed6ad8e2d13fd2063 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 18:29:21 +0000 (18:29 +0000)]
Merge commit '
09f4822e4eaf61513b9092414450f3ae920ccd9d '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 18:27:19 +0000 (18:27 +0000)]
Merge commit '
03ef89faf23c4851848208c9fe004cd9ef690cec '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 18:23:31 +0000 (18:23 +0000)]
Merge commit '
4f22b138886e29f7fffa8c715673951e51be9f32 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 18:21:20 +0000 (18:21 +0000)]
Merge commit '
b06cb15b9d7928bf54b639c9f9f7658c2c38bfb9 '
One big NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 17:45:50 +0000 (17:45 +0000)]
Merge commit '
c59fec783d6540dd96540b079d753ee4a6ad2e58 '
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 17:20:21 +0000 (17:20 +0000)]
Merge commit '
39571e86cb0d55536f649210a025c54e440c632b '
This is a NOOP.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:57:24 +0000 (16:57 +0000)]
Merge commit '
9cce011b1d2f66366f5d75a024c2a2f93dc2b589 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:56:22 +0000 (16:56 +0000)]
Merge commit '
521dc78366c6ea54b7b69426dab302a57231f81e '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:54:57 +0000 (16:54 +0000)]
Merge commit '
fa66237b69c27befa788b100e73783e0f47fe1b7 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:53:23 +0000 (16:53 +0000)]
Merge commit '
62825236dba31a2240e25974a3ba41c1303e4edc '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:48:47 +0000 (16:48 +0000)]
Merge commit '
81737f42c28858dad76a40284a35f7a64faa2fc7 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:47:46 +0000 (16:47 +0000)]
Merge commit '
46350db737a15910f468d30cf7beda16a4cc8332 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 16:46:11 +0000 (16:46 +0000)]
Merge commit '
e8bc642202c10beda1ea4e93ec8492b1e39805e5 '
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 27 Jan 2016 15:19:38 +0000 (15:19 +0000)]
avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Wed, 27 Jan 2016 16:13:10 +0000 (17:13 +0100)]
avcodec/jpeg2000dec: More completely check cdef
Fixes out of array read
Fixes: j2k-poc.bin
Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 27 Jan 2016 12:58:25 +0000 (13:58 +0100)]
avcodec/dvaudiodec: support cases when codec_tag is not set but block_align is
Support packets larger than block size, return single block size.
Signed-off-by: Paul B Mahol <onemda@gmail.com>