]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 18 Aug 2014 18:27:41 +0000 (20:27 +0200)]
Merge commit '
41e1354c101004ccd46dc08d3dd6e956e83a6b51 '
* commit '
41e1354c101004ccd46dc08d3dd6e956e83a6b51 ':
proresenc: Properly account for alpha plane
Conflicts:
libavcodec/proresenc_kostya.c
See:
117bc8e6ffc744fedcf77edf2fdb33c964b83370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Aug 2014 18:20:12 +0000 (20:20 +0200)]
Merge commit '
45ce880a9b3e50cfa088f111dffaf8685bd7bc6b '
* commit '
45ce880a9b3e50cfa088f111dffaf8685bd7bc6b ':
proresenc: Realloc if buffer is too small
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Aug 2014 18:11:31 +0000 (20:11 +0200)]
Merge commit '
58b68e4fdea22e22178e237bda950b09cc6f363a '
* commit '
58b68e4fdea22e22178e237bda950b09cc6f363a ':
proresenc: Report buffer overflow
Conflicts:
libavcodec/proresenc_kostya.c
See:
52b81ff4635c077b2bc8b8d3637d933b6629d803
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Aug 2014 18:01:14 +0000 (20:01 +0200)]
Merge commit '
b16699f2da9c1d41eff852ec3a0c81f74fd44421 '
* commit '
b16699f2da9c1d41eff852ec3a0c81f74fd44421 ':
proresenc: Remove unneeded parameters from encode_alpha_plane()
Conflicts:
libavcodec/proresenc_kostya.c
See:
bf10f09bccdcfdb41b9f5bbae01d55961bfd0693
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Aug 2014 17:51:53 +0000 (19:51 +0200)]
Merge commit '
12640e4cbb142be0cd025bcf37f1ea437bdfecd0 '
* commit '
12640e4cbb142be0cd025bcf37f1ea437bdfecd0 ':
tiff: Return proper error for missing LZMA compression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Aug 2014 17:50:55 +0000 (19:50 +0200)]
Merge commit '
dd35d451fbc34795a8d19ac6c281bed53c42a29b '
* commit '
dd35d451fbc34795a8d19ac6c281bed53c42a29b ':
doc: Change wrong term to avoid confusion
Conflicts:
doc/developer.texi
No change, as the wrong term is not part of our docs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Myznikov [Mon, 18 Aug 2014 17:03:31 +0000 (20:03 +0300)]
avformat/a64: Avoid segfault in a64_write_header() when stream codec is not open
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 18 Aug 2014 14:15:24 +0000 (14:15 +0000)]
proresenc: Properly account for alpha plane
The packet buffer allocation considers the alpha channel as DCT-coded,
while it is actually run-coded and thus requires a larger buffer.
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Christophe Gisquet [Mon, 18 Aug 2014 14:15:23 +0000 (14:15 +0000)]
proresenc: Realloc if buffer is too small
The buffer allocation may be incorrect (e.g. with an alpha plane),
and currently causes the buffer to be set to NULL by init_put_bits,
causing a crash later on.
So, detect that situation, and if detected, reallocate the buffer
and ask for a sample that shows the problem.
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Christophe Gisquet [Mon, 18 Aug 2014 14:15:22 +0000 (14:15 +0000)]
proresenc: Report buffer overflow
If the allocated size, despite best efforts, is too small, exit
with the appropriate error.
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Christophe Gisquet [Mon, 18 Aug 2014 14:15:21 +0000 (14:15 +0000)]
proresenc: Remove unneeded parameters from encode_alpha_plane()
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Paul B Mahol [Mon, 18 Aug 2014 13:36:05 +0000 (13:36 +0000)]
avformat/iff: rudimentary support for animations
For now only first frame is decoded.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Elio Pettenò [Mon, 18 Aug 2014 08:27:49 +0000 (09:27 +0100)]
tiff: Return proper error for missing LZMA compression
The LZMA support is a semi-official extension supported by libtiff 4.0.0
and later.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Clément Bœsch [Wed, 16 Jul 2014 14:42:42 +0000 (16:42 +0200)]
avcodec: export motion vectors in frame side data on demand
The reasoning behind this addition is that various third party
applications are interested in getting some motion information out of a
video "for free" when it is available.
It was considered to export other information as well (such as the intra
information about the block, or the quantization) but the structure
might have ended up into a half full-generic, half full of codec
specific cruft. If more information is necessary, it should either be
added in the "flags" field of the AVMotionVector structure, or in
another side-data.
This commit also includes an example exporting them in a CSV stream.
Michael Niedermayer [Mon, 18 Aug 2014 11:53:55 +0000 (13:53 +0200)]
avdevice/v4l2: try to fix build for openbsd
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 18 Aug 2014 11:00:24 +0000 (11:00 +0000)]
wvdec: check for eof in wv_read_block_header()
Fixes Ticket #3865
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Gabriel Dume [Sun, 17 Aug 2014 20:19:38 +0000 (16:19 -0400)]
doc: Change wrong term to avoid confusion
A function declaration is the prototype.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Paul B Mahol [Mon, 18 Aug 2014 10:32:57 +0000 (10:32 +0000)]
cafdec: check for eof in read_info_chunk()
Fixes Ticket #3864
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 18 Aug 2014 08:24:23 +0000 (10:24 +0200)]
Merge commit '
42604902292ebaba39b13e8efd98419908518019 '
* commit '
42604902292ebaba39b13e8efd98419908518019 ':
Prepare for 11_beta1 Release
Conflicts:
RELEASE
No change, not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 17 Aug 2014 07:47:46 +0000 (09:47 +0200)]
gifdec: use truncated width for image manipulation
Some files seem to have an off-by-one error. In most cases, it appears to
be on the image width. Therefore, if the decoded image doesn't fit in the
screen:
- If it is wider than the screen (and the lzw decoding buffer), reject it;
- Otherwise, decode the indicated amount, but only write a truncated amount
to the screen.
Fixes ticket #3538.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 18 Aug 2014 06:14:01 +0000 (03:14 -0300)]
lavf/wavdec: add sanity check for AVCodecContext.channels
Fixes ticket #3862.
As a side effect, this also fixes aac_latm in wav.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andre Wolokita [Mon, 18 Aug 2014 07:09:22 +0000 (09:09 +0200)]
lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATA
As of September 14 2012, v4l_enumstd() will return ENODATA
when a device's std field is set to 0. That is, the device
does not have a standard format. In order to properly
handle this case, v4l2_set_parameters should catch the
ENODATA code and break instead of failing.
Below is the v4l2-core commit describing this change.
>>commit
a5338190efc7cfa8c99a6856342a77d21c9a05cf
>>Author: Hans Verkuil <hans.verkuil@cisco.com>
>>Date: Fri Sep 14 06:45:43 2012 -0300
>>
>> [media] v4l2-core: tvnorms may be 0 for a given input, handle that case
>>
>> Currently the core code looks at tvnorms to see whether ENUMSTD
>> or G_PARM should be enabled. This is not a good check for drivers
>> that support the STD API on one input and the DV Timings API on another.
>> In that case tvnorms may be 0.
>> Instead check whether s_std is present (for ENUMSTD) or whether g_std or
>> current_norm is present for g_parm.
>> Also, in the enumstd core function return ENODATA if tvnorms is 0,
>> because in that case the current input does not support the STD API
>> and ENUMSTD should return ENODATA for that.
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>> Reviewed-by: Sakari Ailus <sakari.ailus@iki.fi>
>> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Reynaldo H. Verdejo Pinochet [Mon, 18 Aug 2014 00:16:27 +0000 (20:16 -0400)]
ffserver: warn if config uses a system port
Should be harmless as far as users know what they are doing
but an informative warning wont hurt. For details, refer to
http://tools.ietf.org/html/rfc6335
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Stefano Sabatini [Sat, 2 Aug 2014 14:40:53 +0000 (16:40 +0200)]
ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress
The new option names are more explicit.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reinhard Tartler [Mon, 18 Aug 2014 02:18:19 +0000 (22:18 -0400)]
Prepare for 11_beta1 Release
Christophe Gisquet [Sun, 17 Aug 2014 16:56:45 +0000 (18:56 +0200)]
alacenc: fix extra bits extraction
The raw coded bits are extracted prior to decorrelation, as is correctly
performed by the decoder, and not after.
Fixes ticket #2768.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 17 Aug 2014 17:09:13 +0000 (17:09 +0000)]
alacenc: increase predictor buffer
This change is almost cosmetical only, and reduces the changes needed to
fix the 24bps case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Sun, 17 Aug 2014 21:26:45 +0000 (14:26 -0700)]
avformat/mxf: added ULs for demuxing avid media composer mxf files
The AAF SDK refers to these ULs as Legacy. These ULs are the same as the
ones found in FFmbc's version of mxf.c and the ones found in libMXF
Fixes Ticket#1554, Ticket#3100 and Ticket#3450
Michael Niedermayer [Sun, 17 Aug 2014 21:00:27 +0000 (23:00 +0200)]
Merge commit '
369380e1c4c6fc9b0d9ff04ec23d46b252ba7110 '
* commit '
369380e1c4c6fc9b0d9ff04ec23d46b252ba7110 ':
mxf: Support AAC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 20:00:46 +0000 (22:00 +0200)]
Merge commit '
747cd9560c2248ff2834f29cd2190646330e4676 '
* commit '
747cd9560c2248ff2834f29cd2190646330e4676 ':
mxf: Add the UL for the MPEG2VideoDescriptor
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 19:49:27 +0000 (21:49 +0200)]
Merge commit '
304089aca7d238ae184e09993b5c737aa22e2c2c '
* commit '
304089aca7d238ae184e09993b5c737aa22e2c2c ':
mxf: Add UID print helpers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 19:42:49 +0000 (21:42 +0200)]
Merge commit '
11db644a8e54f02e54d2eaad343a87fcb697c15e '
* commit '
11db644a8e54f02e54d2eaad343a87fcb697c15e ':
lavr: Update the planar check in ff_audio_convert
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 19:07:05 +0000 (21:07 +0200)]
Merge commit '
96ce6d6f119a16e489941c629a2805204322b717 '
* commit '
96ce6d6f119a16e489941c629a2805204322b717 ':
doc: Add more information in the README
Conflicts:
README.md
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 18:40:47 +0000 (20:40 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/http: remove special case for cookies attributes.
lavf/http: fix cookie parsing.
Reviewed-by: Ronald S. Bultje
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 17 Aug 2014 12:24:20 +0000 (14:24 +0200)]
lavf/http: remove special case for cookies attributes.
With the previous change, unknown attributes are all ignored,
as specified by the RFC.
Nicolas George [Sun, 17 Aug 2014 12:09:45 +0000 (14:09 +0200)]
lavf/http: fix cookie parsing.
The current code would use any unknown attribute-value pair
as the cookie value.
RFC 6265 states that the first key-value pair is the actual
cookie, and the attribute-value pairs only start after.
With the current code:
Set-Cookie: test=good_value; path=/; dummy=42
gives this:
Cookie: dummy=42
instead of this with the new code:
Cookie: test=good_value
Piotr Bandurski [Sun, 17 Aug 2014 16:17:13 +0000 (18:17 +0200)]
avcodec/lcldec: fix decoding of YUV444 sample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 12 Aug 2014 16:58:52 +0000 (18:58 +0200)]
mxf: Support AAC
Update mxf_set_audio_pts to use the container-provided information.
The UL is marked as "to be changed in the future", but the current
samples in the wild do use it.
Luca Barbato [Tue, 12 Aug 2014 17:02:41 +0000 (19:02 +0200)]
mxf: Add the UL for the MPEG2VideoDescriptor
Luca Barbato [Tue, 12 Aug 2014 14:55:22 +0000 (16:55 +0200)]
mxf: Add UID print helpers
And use it to print non-parsed ULs.
Luca Barbato [Sun, 17 Aug 2014 13:28:03 +0000 (13:28 +0000)]
lavr: Update the planar check in ff_audio_convert
Leftover from
fbc0b8659967ea54a8472b5f795270d38bb085dd .
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sun, 17 Aug 2014 13:00:16 +0000 (15:00 +0200)]
avcodec/h264_mb: fix grayscale only decoding with weighted prediction
Fixes Ticket3412
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 12:30:32 +0000 (14:30 +0200)]
avcodec/rpza: fix +- error
Fixes Ticket3471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Aug 2014 12:30:06 +0000 (14:30 +0200)]
vcodec/rpza: print mismatching size in case of error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Aug 2014 17:44:50 +0000 (19:44 +0200)]
avformat/movenchint: use av_freep() for safety
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 21 Apr 2014 15:49:33 +0000 (17:49 +0200)]
ffprobe: add -show_data_hash option.
Timothy Gu [Sun, 17 Aug 2014 00:47:14 +0000 (17:47 -0700)]
vidstabutils: fix indentation
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Aug 2014 21:07:28 +0000 (23:07 +0200)]
avformat/mpegts: Use differential score for analyze()
This avoids high scores in random data that has a high 0x47 frequency
Fixes Ticket3844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 23:43:26 +0000 (01:43 +0200)]
swresample: Add AVFrame based API
Based on commit
fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45 by Luca Barbato <lu_zero@gentoo.org>
Adapted for libswresample by Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Aug 2014 18:00:22 +0000 (20:00 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
mpegts: always parse pcr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ben Hagen [Sat, 16 Aug 2014 14:05:04 +0000 (16:05 +0200)]
cinedec: add shutter and crop metadata
Michael Niedermayer [Fri, 15 Aug 2014 22:49:12 +0000 (00:49 +0200)]
avcodec/mips/compute_antialias_float: remove unused variable
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 22:47:45 +0000 (00:47 +0200)]
avcodec/hevc_mvs: dont redundantly initialize ref_idx_curr
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Aug 2014 13:50:27 +0000 (15:50 +0200)]
avformat/udp: remove unneeded variable initialization
Found-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 22:43:27 +0000 (00:43 +0200)]
avformat/udp: dont mix integers with pointers
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 22:41:07 +0000 (00:41 +0200)]
avcodec/dvbsubdec: dont mix integers with pointers
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 22:38:30 +0000 (00:38 +0200)]
avcodec/dvdsubdec: Dont mix integers with pointers
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 29 Jul 2014 19:23:57 +0000 (21:23 +0200)]
dict.c: empty dictionaries should be a NULL pointer.
Ensure this is even the case if they are empty because
we failed adding the first entry.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 29 Jul 2014 19:10:39 +0000 (21:10 +0200)]
Use new av_dict_set_int helper function.
Get rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Thu, 31 Jul 2014 18:08:19 +0000 (20:08 +0200)]
dict.c: Add av_dict_set_int helper function.
This allows getting rid of the many, slightly differing, implementations
of basically the same thing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Marton Balint [Sat, 9 Aug 2014 20:47:34 +0000 (22:47 +0200)]
mpegts: always parse pcr
Previously pcr transmitted without payload but as part of the video stream was
not parsed.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Fri, 15 Aug 2014 22:42:11 +0000 (00:42 +0200)]
avformat/thp: dont mix integers with pointers
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 23:31:37 +0000 (01:31 +0200)]
avfilter/lavfutils/ff_load_image: Return error if no frame could be decoded
Based-on suggestion by JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 12 Aug 2014 17:34:47 +0000 (19:34 +0200)]
doc: Add more information in the README
And convert it to Markdown.
Clément Bœsch [Fri, 15 Aug 2014 19:11:57 +0000 (21:11 +0200)]
ffmpeg: look for encoding options in both avcodec and avformat
This patch is the same as
8a1714ad85dd5defdf1fb2baba9ababebfa47d01 but
applied to encoding. It fixes the current clash of the -password option
between tta decoder and the icecast protocol.
Michael Niedermayer [Fri, 15 Aug 2014 19:31:59 +0000 (21:31 +0200)]
Drop remaining unneeded != NULL
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 19:21:14 +0000 (21:21 +0200)]
Merge commit '
4b1f5e5090abed6c618c8ba380cd7d28d140f867 '
* commit '
4b1f5e5090abed6c618c8ba380cd7d28d140f867 ':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 18:33:21 +0000 (20:33 +0200)]
Merge commit '
f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 '
* commit '
f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 ':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 18:25:12 +0000 (20:25 +0200)]
Merge commit '
efd26bedec9a345a5960dbfcbaec888418f2d4e6 '
* commit '
efd26bedec9a345a5960dbfcbaec888418f2d4e6 ':
build: Add explanatory comments to (optimization) blocks in the Makefiles
Conflicts:
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 18:00:34 +0000 (20:00 +0200)]
Merge commit '
835f798c7d20bca89eb4f3593846251ad0d84e4b '
* commit '
835f798c7d20bca89eb4f3593846251ad0d84e4b ':
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Conflicts:
libavcodec/h261dec.c
libavcodec/intrax8.c
libavcodec/mjpegenc.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 17:48:28 +0000 (19:48 +0200)]
vformat/utils: call flush_packet_queue() from avformat_free_context()
This avoids some theoretical memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Myznikov [Fri, 15 Aug 2014 14:25:15 +0000 (17:25 +0300)]
Fix packet_buffer memory leak in avformat_free_context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gabriel Dume [Thu, 14 Aug 2014 20:31:25 +0000 (16:31 -0400)]
cosmetics: Write NULL pointer inequality checks more compactly
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 15 Aug 2014 10:45:11 +0000 (12:45 +0200)]
Merge commit '
a6a27fede94efe48aad1dcc9d5e000d2de71c7b2 '
* commit '
a6a27fede94efe48aad1dcc9d5e000d2de71c7b2 ':
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 10:38:31 +0000 (12:38 +0200)]
Merge commit '
7c371754fbc0dcc23bd00278b147f8095ccc5625 '
* commit '
7c371754fbc0dcc23bd00278b147f8095ccc5625 ':
atomic_win32: Drop unnecessary atomic.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 10:31:29 +0000 (12:31 +0200)]
Merge commit '
6baeadd11083774ebd823dd5e1a744c2150a3bfc '
* commit '
6baeadd11083774ebd823dd5e1a744c2150a3bfc ':
w32pthreads: Mark functions in compatibility wrapper as av_unused
Conflicts:
compat/w32pthreads.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Gabriel Dume [Thu, 14 Aug 2014 20:31:24 +0000 (16:31 -0400)]
cosmetics: Write NULL pointer equality checks more compactly
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 15 Aug 2014 10:11:55 +0000 (12:11 +0200)]
Merge commit '
7ccb847f0f1f28199fa254847b91b6e50fb92832 '
* commit '
7ccb847f0f1f28199fa254847b91b6e50fb92832 ':
http: Reduce scope of a variable in parse_content_encoding()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 31 Jul 2014 11:52:24 +0000 (04:52 -0700)]
build: Add explanatory comments to (optimization) blocks in the Makefiles
Diego Biurrun [Sun, 10 Aug 2014 15:25:12 +0000 (08:25 -0700)]
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Diego Biurrun [Thu, 14 Aug 2014 18:56:32 +0000 (20:56 +0200)]
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
Diego Biurrun [Thu, 14 Aug 2014 18:55:15 +0000 (20:55 +0200)]
atomic_win32: Drop unnecessary atomic.h #include
The file does not require atomic.h. Also kills function redefinition warnings.
Diego Biurrun [Thu, 14 Aug 2014 12:40:19 +0000 (14:40 +0200)]
w32pthreads: Mark functions in compatibility wrapper as av_unused
This avoids annoying warnings about unused functions. The compatibility
wrapper is designed to provide a complete (stub) API, so some functions
being unused by some files is natural and no reason for a warning.
Diego Biurrun [Wed, 13 Aug 2014 19:33:27 +0000 (21:33 +0200)]
http: Reduce scope of a variable in parse_content_encoding()
Also fixes an unused variable warning with zlib disabled.
Michael Niedermayer [Fri, 15 Aug 2014 02:46:24 +0000 (04:46 +0200)]
ffmpeg: remove 32 channel limit from audio_channels_map
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 13 Aug 2014 16:40:17 +0000 (18:40 +0200)]
ffmpeg: fix streamcopy with side data
The issue is that, when the main packet data buffer is changed, streamcopy
uses a temporary new packet to store that buffer, frees the old packet, and
replace it with the new packet.
However, in doing so, it forgets about the side data, which gets freed, but
is still needed and referenced. Then, when the packet gets freed again in
the normal code path, it attempts to free its side data which has already
been freed.
Therefore, simply avoid the first free on side data by removing that side
data from the packet.
Fixes ticket #3773.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 00:50:41 +0000 (02:50 +0200)]
avcodec/h261dec: Fix context initialization sequence
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 00:41:43 +0000 (02:41 +0200)]
Merge commit '
552bc42df48784ae3ce0d499ece5b33f3cc7576a '
* commit '
552bc42df48784ae3ce0d499ece5b33f3cc7576a ':
h261dec: Fix order of initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 00:27:03 +0000 (02:27 +0200)]
Merge commit '
b869eea7ea8f5d8331fcd6355f848bb6a6e06b14 '
* commit '
b869eea7ea8f5d8331fcd6355f848bb6a6e06b14 ':
h263dec: Fix order of initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 15 Aug 2014 00:08:59 +0000 (02:08 +0200)]
Merge commit '
998c9f15d1ca8c7489775ebcca51623b915988f1 '
* commit '
998c9f15d1ca8c7489775ebcca51623b915988f1 ':
idct: remove call to ff_idctdsp_init from ff_MPV_common_init
Conflicts:
libavcodec/dnxhdenc.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Aug 2014 18:42:53 +0000 (20:42 +0200)]
avutil/opt: remove disabled old ABI compatibility code
Fixes some unused variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Aug 2014 18:40:11 +0000 (20:40 +0200)]
avformat/format: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Thu, 14 Aug 2014 15:14:15 +0000 (17:14 +0200)]
lavc/flacdsp: change lpc_encoder function pointer prototype
This should help to clarify the API.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Aug 2014 17:42:34 +0000 (19:42 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/avf_showspectrum: check RDFT context init.
lavfi/avf_showspectrum: add full frame sliding mode.
lavfi/avf_showspectrum: use automatic framing.
lavfi/avf_showspectrum: do not push the frame at EOF.
lavfi/avf_showspectrum: fix output pts computation.
lavfi/avf_showspectrum: set output frame rate.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 14 Aug 2014 16:56:10 +0000 (18:56 +0200)]
avfilter/select: larger pixel sad computation
Clément Bœsch [Thu, 14 Aug 2014 16:52:47 +0000 (18:52 +0200)]
avfilter/select: re-align a few comments
John Stebbins [Fri, 8 Aug 2014 15:55:48 +0000 (08:55 -0700)]
h261dec: Fix order of initialization
ff_MPV_common_init requires the frame dimensions which get parsed in
h261_decode_picture_header.
John Stebbins [Fri, 8 Aug 2014 15:21:02 +0000 (08:21 -0700)]
h263dec: Fix order of initialization
ff_MPV_common_init requires the frame dimensions which get parsed in
*_decode_picture_header.
John Stebbins [Fri, 8 Aug 2014 15:11:20 +0000 (08:11 -0700)]
idct: remove call to ff_idctdsp_init from ff_MPV_common_init
One step in untangling the mpegvideo code and fixing some problems in
the order that initialization is being done in h263dec and h261dec.
Michael Niedermayer [Thu, 14 Aug 2014 14:19:53 +0000 (16:19 +0200)]
avcodec/mjpegdec: Support AV_PIX_FMT_YUV420P16 with upscale_h
Fixes assertion failure
Fixes: test42f.jpg
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>