Michael Niedermayer [Mon, 4 May 2015 15:59:45 +0000 (17:59 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavfi/cropdetect: Fix cropdetect for > 8 bit input.
lavf/apngenc: Fix png remuxing by using default extension apng.
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 4 May 2015 15:50:16 +0000 (17:50 +0200)]
lavfi/cropdetect: Fix cropdetect for > 8 bit input.
Carl Eugen Hoyos [Mon, 4 May 2015 15:49:36 +0000 (17:49 +0200)]
lavf/apngenc: Fix png remuxing by using default extension apng.
Carl Eugen Hoyos [Mon, 4 May 2015 15:44:14 +0000 (17:44 +0200)]
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.
Reported and early patch version tested by forum user gridtank.
Reviewed-by: Tomas Härdin
Michael Niedermayer [Mon, 4 May 2015 15:33:40 +0000 (17:33 +0200)]
cmdutils: Ask for a sample in case a odd rotation angle is encountered
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 May 2015 13:47:54 +0000 (15:47 +0200)]
avformat/matroskadec: Use tracks[k]->stream instead of s->streams[k]
The later is not correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 3 May 2015 21:55:20 +0000 (23:55 +0200)]
matroskadec: check s->streams[k] before using it
This fixes a segmentation fault.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 May 2015 11:37:26 +0000 (13:37 +0200)]
avcodec/ffv1dec: Check chroma shift parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 May 2015 11:33:16 +0000 (13:33 +0200)]
avcodec/ffv1dec: More completely check micro_version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 May 2015 11:25:31 +0000 (13:25 +0200)]
avcodec/ffv1dec: Check quant table symbols more completely
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 3 May 2015 21:07:20 +0000 (23:07 +0200)]
matroskadec: use uint64_t instead of int for index_scale
index_scale is set to matroska->time_scale of type uint64_t.
When index_scale is int, the assignment can overflow and e.g. result
in index_scale = 0. This causes a floating point exception due to the
division by index_scale.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 May 2015 21:53:32 +0000 (23:53 +0200)]
ffmpeg_filter: use get_rotation()
This unifies the rotation extraction code between ffplay and ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 May 2015 21:49:16 +0000 (23:49 +0200)]
ffplay&cmdutils:Factor get_rotation() code out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sun, 3 May 2015 13:07:40 +0000 (18:37 +0530)]
avcodec/ccaption_dec: correcting line breaks in cc
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 May 2015 00:27:54 +0000 (02:27 +0200)]
ffplay: unify displaymatrix based rotation code
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 3 May 2015 18:36:20 +0000 (20:36 +0200)]
pngdec: don't use AV_PIX_FMT_MONOBLACK for apng
AV_PIX_FMT_MONOBLACK has the AV_PIX_FMT_FLAG_BITSTREAM flag, i.e.
linesize can be smaller than width.
Since x_offset is only check against the width, this can lead to
x_offset * bpp >= image_linesize.
In this case ptr could be set to a position outside the image_buf in
png_handle_row, leading to memory corruption and thus crashes.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 3 May 2015 15:50:26 +0000 (17:50 +0200)]
pngdec: return correct error code from decode_frame_common
During the loop ret can get changed. Since it is not set on all failure
paths, decode_frame_common can return 0 even though an error occurred.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 3 May 2015 14:21:39 +0000 (16:21 +0200)]
pngdec: check s->last_picture.f->data[0] before using it
This check was removed in commit
08aec6f6, but
s->last_picture.f->data[0] is still used in handle_p_frame_apng
unconditionally.
This fixes a segmentation fault.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 May 2015 13:54:21 +0000 (15:54 +0200)]
avcodec/wavpack: Check L/R values before use to avoid harmless integer overflow and undefined behavior in fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 May 2015 14:14:55 +0000 (16:14 +0200)]
avutil/opt: Avoid division by 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Muhammad Faiz [Fri, 1 May 2015 09:44:59 +0000 (16:44 +0700)]
avfilter/avf_showcqt: optimize gamma calculation
benchmark (on intel core2 duo, gcc 4.9.1)
input samples duration 00:03:39.59
command: time -p ffmpeg -f f32le -ac 2 -ar 44100 -i input.pcm \
-filter_complex showcqt=fullhd=0:gamma=$gamma \
-f rawvideo -y /dev/null
gamma previous modified
1 48.49 s 45.38 s
2 49.33 s 48.11 s
3 80.86 s 59.80 s
4 80.84 s 51.25 s
5 80.75 s 61.06 s
6 80.93 s 61.80 s
7 80.03 s 61.56 s
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 13:00:35 +0000 (15:00 +0200)]
avcodec/nvenc: Make pix_fmts_nvenc const
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jérôme Martinez [Sat, 2 May 2015 11:23:12 +0000 (13:23 +0200)]
ffv1dec: plane_index is 1 in case of version 4 gray+alpha.
Since version 4, plane_index for the alpha plane is 1 in the case chroma_planes is 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 23:43:30 +0000 (01:43 +0200)]
LICENSE.md: add *_rect filters
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 23:42:51 +0000 (01:42 +0200)]
configure: prepend avfilter_deps for *_rect filters
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 23:29:41 +0000 (01:29 +0200)]
Merge commit '
3edeb7749e4276c78ad57307b8c3b32dd476d1da'
* commit '
3edeb7749e4276c78ad57307b8c3b32dd476d1da':
configure: Allow log2 with MSVC 2013 onwards.
Conflicts:
configure
See:
4d93e758d732726fa7e20693db1f447985f1d6d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 23:20:24 +0000 (01:20 +0200)]
Merge commit '
863ee06809b215895ee20cbc557eeceb904cf770'
* commit '
863ee06809b215895ee20cbc557eeceb904cf770':
configure: Use the right local variable in the MSVC and ICL probes
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 23:04:14 +0000 (01:04 +0200)]
Merge commit '
709e1c91ea7a5bbf2b9a104642572ca7616b224f'
* commit '
709e1c91ea7a5bbf2b9a104642572ca7616b224f':
avprobe: Print the display matrix from per-stream sidedata
Conflicts:
avprobe.c
See:
08152f2df2c894dea22960572fe0bd9157cb52a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 22:40:50 +0000 (00:40 +0200)]
ffprobe: support printing AVStream and AVPacket side data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 22:39:08 +0000 (00:39 +0200)]
ffprobe: Add Support to print information about AV_FRAME_DATA_DISPLAYMATRIX
Idea from
709e1c91ea7a5bbf2b9a104642572ca7616b224f by Martin Storsjö
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 21:45:00 +0000 (23:45 +0200)]
ffprobe: add writer_print_integers() to allow printing formated 1d and 2d arrays of integers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 21:43:51 +0000 (23:43 +0200)]
Merge commit '
3080b0497ddf8549d86ee99b79ac0c15f44ee382'
* commit '
3080b0497ddf8549d86ee99b79ac0c15f44ee382':
avprobe: Support writing arrays of integers without keys
Conflicts:
avprobe.c
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 21:04:00 +0000 (23:04 +0200)]
ffmpeg_opt: remove rotate metadata in case of autorotate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 20:39:00 +0000 (22:39 +0200)]
Merge commit '
16302246b1fcb7ad4e6f7bd31c49956a455336d2'
* commit '
16302246b1fcb7ad4e6f7bd31c49956a455336d2':
avconv: Add an option for automatically rotating video according to display matrix
Conflicts:
Changelog
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 20:21:28 +0000 (22:21 +0200)]
Merge commit '
e2d50fc2f5f3600e13055acf1a10fec35e941f37'
* commit '
e2d50fc2f5f3600e13055acf1a10fec35e941f37':
avplay: Add support for rotated video
Conflicts:
configure
doc/ffplay.texi
ffplay.c
See:
08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 20:07:27 +0000 (22:07 +0200)]
Merge commit '
21180b73239c6360aa28496d4879713b7ba4a8e5'
* commit '
21180b73239c6360aa28496d4879713b7ba4a8e5':
avplay: Factorize code for adding filters to the filter pipeline
Conflicts:
ffplay.c
See:
08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 19:28:31 +0000 (21:28 +0200)]
configure: add forgotten avcodec/avformat deps for find/cover_rect
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 19:00:38 +0000 (21:00 +0200)]
avfilter: Add cover_rect filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 19:00:01 +0000 (21:00 +0200)]
avfilter: add find_rect filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Sun, 11 May 2014 07:40:20 +0000 (17:40 +1000)]
configure: Allow log2 with MSVC 2013 onwards.
Only MSVC 2010 in x64 mode, in the static msvcrt, had a
stray log2 function (which wasn't available in the headers).
MSVC 2013 has got a proper log2 function though.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 5 Jun 2014 19:59:47 +0000 (22:59 +0300)]
configure: Use the right local variable in the MSVC and ICL probes
$cc is the compiler requested as main target compiler, while $_cc
is the actual tool tested in the probe function right now (which
can also be e.g. the host compiler).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 29 Apr 2015 13:48:26 +0000 (16:48 +0300)]
avprobe: Print the display matrix from per-stream sidedata
This is printed in a separate subgroup "displaymatrix" inside a
new group named "sidedata". The subgroup has got two values,
"rotation" (which is the parsed rotation from the matrix) and
"matrix" containing the full actual values.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 2 May 2015 08:22:13 +0000 (11:22 +0300)]
avprobe: Support writing arrays of integers without keys
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 29 Apr 2015 14:59:01 +0000 (17:59 +0300)]
avconv: Add an option for automatically rotating video according to display matrix
The option is enabled by default, but can be disabled.
If this is enabled, such side data isn't copied into the output stream
(except when doing stream copy).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 29 Apr 2015 19:28:45 +0000 (22:28 +0300)]
avplay: Add support for rotated video
This is enabled by default, but can be disbled via the -noautorotate
option.
Based on a patch by Clément Bœsch.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 29 Apr 2015 19:24:48 +0000 (22:24 +0300)]
avplay: Factorize code for adding filters to the filter pipeline
Significantly based on a patch by Clément Bœsch.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 2 May 2015 01:02:30 +0000 (03:02 +0200)]
libavcodec/svq3: clarify unknown_flag by renaming to has_watermark
The name is based on how the field is used in the code
Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 13:02:01 +0000 (15:02 +0200)]
avfilter/vf_libopencv: Make ocv_filter_entries const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 12:37:48 +0000 (14:37 +0200)]
avutil/cast5: Make iv array static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 12:37:08 +0000 (14:37 +0200)]
avutil/cast5: Mark key_bits as const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 11:43:15 +0000 (13:43 +0200)]
avcodec/x86/dct-test: Use uint8_t for idct_simple_mmx_perm
The table contains no element outside the unsigned 8bit range
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 11:42:46 +0000 (13:42 +0200)]
avcodec/x86/dct-test: Make static table const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 11:27:18 +0000 (13:27 +0200)]
avformat/matroskadec: Mark static tables as const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Sat, 2 May 2015 07:07:29 +0000 (02:07 -0500)]
lavf/http: support HTTPS when listening
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 May 2015 00:58:00 +0000 (02:58 +0200)]
avcodec/svq3: Print unknown fields at debug level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 May 2015 20:23:37 +0000 (22:23 +0200)]
Merge remote-tracking branch 'rbultje/vp9-profile1-wip'
* rbultje/vp9-profile1-wip:
vp9: add fate test for 422.
vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
vp9: add yuv440 fate test.
vp9: fix mask_edges and filter_plane_rows/cols() for 440.
vp9: more specifically specify mask destination to mask_edges().
vp9: add fate test for profile 1 444.
vp9: don't create special u/v filter masks for 444.
vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
vp9: invert order of two conditions.
vp9: use correct chroma subsampling for profile 1 inter block recon.
vp9: use correct chroma subsampling for profile 1 intra block recon.
vp9: take chroma subsampling into account when walking the block tree.
vp9: support non-420 chroma subsampling for profile 1 token decoding.
vp9: increase buffer sizes for non-420 chroma subsamplings.
vp9: profile 1 header decoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 May 2015 19:52:04 +0000 (21:52 +0200)]
Michael Niedermayer [Fri, 1 May 2015 19:34:35 +0000 (21:34 +0200)]
Merge commit '
6503cbf842a026faec517eb980551089168c7d8a'
* commit '
6503cbf842a026faec517eb980551089168c7d8a':
ffv1enc: Add const attribute to input frame
Conflicts:
libavcodec/ffv1.h
no change, the changed field does not exist in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 29 Apr 2015 16:18:37 +0000 (17:18 +0100)]
dnxhddec: Fix pixel format change
Regression introduced in
598f7d046cbf306706623210c5baafa3b7cd1df3.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Wed, 29 Apr 2015 15:35:43 +0000 (16:35 +0100)]
ffv1enc: Add const attribute to input frame
warning: assigning to 'AVFrame *' (aka 'struct AVFrame *') from
'const AVFrame *' (aka 'const struct AVFrame *') discards
qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
Michael Niedermayer [Fri, 1 May 2015 10:28:40 +0000 (12:28 +0200)]
avcodec/h264: Remove failure on data partitioning
decode all NAL units instead
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 30 Apr 2015 15:59:15 +0000 (17:59 +0200)]
vp9: add fate test for 422.
Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp91-2-04-yuv422.webm
Ronald S. Bultje [Thu, 30 Apr 2015 15:44:12 +0000 (17:44 +0200)]
vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
Ronald S. Bultje [Thu, 30 Apr 2015 13:36:03 +0000 (15:36 +0200)]
vp9: add yuv440 fate test.
Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp91-2-04-yuv440.webm
Ronald S. Bultje [Thu, 30 Apr 2015 13:33:36 +0000 (15:33 +0200)]
vp9: fix mask_edges and filter_plane_rows/cols() for 440.
Ronald S. Bultje [Thu, 30 Apr 2015 09:36:06 +0000 (11:36 +0200)]
vp9: more specifically specify mask destination to mask_edges().
Ronald S. Bultje [Thu, 30 Apr 2015 09:09:45 +0000 (11:09 +0200)]
vp9: add fate test for profile 1 444.
Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp91-2-04-yuv444.webm
Ronald S. Bultje [Thu, 30 Apr 2015 09:01:44 +0000 (11:01 +0200)]
vp9: don't create special u/v filter masks for 444.
This fixes vp91-2-04-yuv444.webm.
Ronald S. Bultje [Thu, 30 Apr 2015 08:54:26 +0000 (10:54 +0200)]
vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
Ronald S. Bultje [Thu, 30 Apr 2015 08:11:20 +0000 (10:11 +0200)]
vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
Ronald S. Bultje [Tue, 28 Apr 2015 07:29:46 +0000 (09:29 +0200)]
vp9: invert order of two conditions.
This makes it equal to row-based loopfilter code, and also makes the
chroma/luma code identical.
Ronald S. Bultje [Fri, 24 Apr 2015 15:28:30 +0000 (11:28 -0400)]
vp9: use correct chroma subsampling for profile 1 inter block recon.
Ronald S. Bultje [Fri, 24 Apr 2015 14:49:41 +0000 (10:49 -0400)]
vp9: use correct chroma subsampling for profile 1 intra block recon.
Ronald S. Bultje [Fri, 24 Apr 2015 15:10:37 +0000 (11:10 -0400)]
vp9: take chroma subsampling into account when walking the block tree.
Ronald S. Bultje [Fri, 24 Apr 2015 14:47:56 +0000 (10:47 -0400)]
vp9: support non-420 chroma subsampling for profile 1 token decoding.
Ronald S. Bultje [Fri, 24 Apr 2015 15:04:00 +0000 (11:04 -0400)]
vp9: increase buffer sizes for non-420 chroma subsamplings.
Ronald S. Bultje [Fri, 24 Apr 2015 14:59:12 +0000 (10:59 -0400)]
vp9: profile 1 header decoding.
Shivraj Patil [Mon, 27 Apr 2015 13:54:45 +0000 (19:24 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H264 lpf and weight/biweight functions
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 May 2015 01:15:46 +0000 (03:15 +0200)]
avcodec/svq3: Fix memleak of last_pic_for_ec
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 May 2015 00:14:14 +0000 (02:14 +0200)]
avformat/mpegts: Detect changes in packet through CRC instead of just the 5bit version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 May 2015 00:13:26 +0000 (02:13 +0200)]
avformat/mpegts: reset last_ver on corrupted packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Apr 2015 20:24:09 +0000 (22:24 +0200)]
avformat/mpegts: Factorize version checking code out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Thu, 30 Apr 2015 19:56:24 +0000 (12:56 -0700)]
lavf/webm_chunk: Fix a memory leak.
Fix a duplicate memory allocation. priv_data should be allocated
in line 64 call to avformat_alloc_output_context2 since we pass
the correct AVFormat to it. This removes the duplicate allocation.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 30 Apr 2015 20:03:10 +0000 (22:03 +0200)]
vp9: fix show-existing-frames for multi-threading.
This also fixes intra-only MT failures (it was the same bug), see trac
4526 and 4527.
Tested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 30 Apr 2015 20:22:27 +0000 (17:22 -0300)]
avutil/softfloat_tables: add missing stdint.h include
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 30 Apr 2015 20:23:29 +0000 (22:23 +0200)]
Merge commit '
06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
* commit '
06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e':
avplay: Do not print a possibly uninitialized value
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Apr 2015 20:15:16 +0000 (22:15 +0200)]
Merge commit '
e8c4db0d4d07738fed716b1d2f20c85aac944641'
* commit '
e8c4db0d4d07738fed716b1d2f20c85aac944641':
xcbgrab: Validate the capture area
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Apr 2015 19:59:56 +0000 (21:59 +0200)]
Merge commit '
82a10225f817b2612fdd2b23af9d4f0a3408df3b'
* commit '
82a10225f817b2612fdd2b23af9d4f0a3408df3b':
xcbgrab: Do not assume the non shm image data is always available
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Thu, 30 Apr 2015 18:34:44 +0000 (11:34 -0700)]
lavf/webm_chunk: Use dyn_buf to write chunks
Use dyn_duf to write chunks so that we create the actual chunk
file only after the entire chunk data is available. This will help
not confuse other software looking at the chunk file (e.g. a web
server) by seeing a zero length file when ffmpeg is writing into
it.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Thu, 30 Apr 2015 11:51:37 +0000 (13:51 +0200)]
libavutil/softfloat: Add functions.
Functions av_gt_sf, av_sqrt_sf and av_sincos_sf added to softfloat
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Thu, 30 Apr 2015 11:51:36 +0000 (13:51 +0200)]
libavutil/softfloat: Added av_normalize_sf in av_add_sf
This will normalize sums for which mantissa is smaller than the lower boundary
(needed for implementation of fixed point aac decoder).
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Thu, 30 Apr 2015 11:51:35 +0000 (13:51 +0200)]
libavutil/softfloat: exponent adjusted for aac fixed point dec
Exponent usage and calculation in softfloat adjusted to the format used in
implementation of fixed point aac decoder.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 28 Apr 2015 19:24:27 +0000 (21:24 +0200)]
avplay: Do not print a possibly uninitialized value
Initialize `diff` to 0.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 14 Mar 2015 11:30:11 +0000 (12:30 +0100)]
xcbgrab: Validate the capture area
And notify why the capture is impossible.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 14 Mar 2015 11:30:10 +0000 (12:30 +0100)]
xcbgrab: Do not assume the non shm image data is always available
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Thu, 30 Apr 2015 01:03:31 +0000 (03:03 +0200)]
avfilter/lavfutils: disable frame threads when decoding a single image
The image decoding code does expect the image to be decoded immedeatly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Apr 2015 22:02:47 +0000 (00:02 +0200)]
avformat/mov: Do not read ACLR into extradata for H.264
Fixes regression decoding AVCI
Fixes Ticket4493
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Mar 2015 19:50:15 +0000 (21:50 +0200)]
avfilter/vf_vignette: force per frame evaluation if per frame variables are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Apr 2015 18:13:59 +0000 (20:13 +0200)]
avcodec/cook: Remove unneeded #if
The code is already doing nothing if DEBUG is disabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Apr 2015 04:26:18 +0000 (06:26 +0200)]
avformat/mpegts: Also parse the FMC descriptor if the codec has not been identified yet
Fixes Detecting AAC with such descriptor if the parts needed for detection
are later in the stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>