]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 2 Feb 2014 04:32:01 +0000 (05:32 +0100)]
Merge commit '
09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e '
* commit '
09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e ':
hevc: Consider first quantization group any reference to 0, 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 04:23:59 +0000 (05:23 +0100)]
Merge commit '
c716624853339ea4b1086a3957b334829370204c '
* commit '
c716624853339ea4b1086a3957b334829370204c ':
mxf: Read field dominance flag
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 04:05:11 +0000 (05:05 +0100)]
Merge commit '
7d56f2fffc14ad02001ee0689bee76a759da9ede '
* commit '
7d56f2fffc14ad02001ee0689bee76a759da9ede ':
mxf: Handle negative edit_rate
Conflicts:
libavformat/mxfdec.c
See:
83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 01:42:09 +0000 (02:42 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/opengl_enc: remove inlines
lavd/opengl_enc: fix window caption
lavd/opengl_enc: simplify opengl_load_procedures usage
lavd/opengl_enc: factorize deinit_context function
lavd/opengl_enc: factorize create/release window functions
lavd/opengl_enc: rename GL_RED_COMPONENT define
lavd/opengl_enc: create format description table
lavd/opengl_enc_shaders: make shaders code static and const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 01:33:16 +0000 (02:33 +0100)]
avcodec/hevc: propagate error code from hls_coding_quadtree()
Fixes use of uninitialized memory
Fixes out of array read
Fixes: asan_static-oob_123cee5_2630_cov_1869071233_PICSIZE_A_Bossen_1.bin
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 2 Feb 2014 01:26:02 +0000 (02:26 +0100)]
lavd/opengl_enc: remove inlines
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sun, 2 Feb 2014 00:21:53 +0000 (01:21 +0100)]
lavd/opengl_enc: fix window caption
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 16:14:40 +0000 (17:14 +0100)]
lavd/opengl_enc: simplify opengl_load_procedures usage
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 16:13:15 +0000 (17:13 +0100)]
lavd/opengl_enc: factorize deinit_context function
This commit also fixes opengl deinitialization.
Program and shaders where not deleted.
Could impact MacOS implementation based on SDL window.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 13:39:37 +0000 (14:39 +0100)]
lavd/opengl_enc: factorize create/release window functions
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 13:29:13 +0000 (14:29 +0100)]
lavd/opengl_enc: rename GL_RED_COMPONENT define
Rename GL_RED_COMPONENT into FF_GL_RED_COMPONENT
to explicity mark it is internal define, not OpenGL API.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sun, 2 Feb 2014 00:47:36 +0000 (01:47 +0100)]
avcodec/tiff: reset geotag_count in free_geotags()
Fixes null pointer dereference
Fixes: signal_sigsegv_19d922e_3688_cov_1577641655_aletrek_tiff.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 1 Feb 2014 13:15:25 +0000 (14:15 +0100)]
lavd/opengl_enc: create format description table
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Thu, 30 Jan 2014 15:34:08 +0000 (16:34 +0100)]
lavd/opengl_enc_shaders: make shaders code static and const
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sat, 1 Feb 2014 23:11:16 +0000 (00:11 +0100)]
avdevice/v4l2: only use average frame rate if set
It might be unset on some platforms with some drivers and some input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 23:10:43 +0000 (00:10 +0100)]
avdevice/v4l2: only use frame period from v4l2 if valid
There is evidence that some drivers do not set a valid value
See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718805
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
addr-see-the-website@aetey.se [Fri, 31 Jan 2014 19:06:15 +0000 (20:06 +0100)]
RoQ-encoder: introducing Quake 3 compatibility option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
addr-see-the-website@aetey.se [Wed, 29 Jan 2014 13:33:45 +0000 (14:33 +0100)]
RoQ decoder: Remove misleading diagnostics.
It is not necessarily an error when a chunk does not cover a whole block.
Messages did not reflect the actual situation either.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 18:04:37 +0000 (19:04 +0100)]
avcodec/vc1: reset fcm/field_mode in non advanced header parsing
Fixes NULL pointer dereference
Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 16:07:40 +0000 (17:07 +0100)]
avcodec/vc1: Check bfraction_lut_index
Fixes: out of array read
Fixes: asan_static-oob_1b40507_2849_SA10143.vc1
Fixes: asan_static-oob_1b40a15_2849_cov_1182297305_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_2159513432_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_3230311510_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 16:06:24 +0000 (17:06 +0100)]
avcodec/vc1: factor read_bfraction() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 03:22:50 +0000 (04:22 +0100)]
hevc: Consider first quantization group any reference to 0, 0
According to my understanding of T-REC-H.265-
2013044 chapter 8.6.1.
Sample-Id:
00001438 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Matthieu Bouron [Sat, 16 Feb 2013 12:52:29 +0000 (13:52 +0100)]
mxf: Read field dominance flag
And export the information in field_order.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Wed, 8 Jan 2014 00:20:00 +0000 (01:20 +0100)]
mxf: Handle negative edit_rate
Default to 1/25.
Michael Niedermayer [Sat, 1 Feb 2014 04:46:24 +0000 (05:46 +0100)]
avcodec/vc1dec: Print warning for frame pictures with direct mode MBs, followed by field pictures
This case is not implemented
No non fuzzed samples are known to use this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 04:34:25 +0000 (05:34 +0100)]
avcodec/vc1dec: field pictures with direct mode MBs, followed by frame pictures are not supported
This case could occur when cuting and concatenating bitstreams
Fixes out of array read
Fixes: asan_heap-oob_1b33fdd_2849_cov_478905890_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 21:50:37 +0000 (22:50 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Auto-detect hevc in mpeg-ts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 19:59:57 +0000 (20:59 +0100)]
avcodec/mjpegdec: use the correct linesize in the flipping code
Fixes out of array access
No releases should be affected
Depends on
7c3700cd1d8683966b21fffbf02e326d0bd14e06 , do not backport without this one
Fixes: asan_heap-oob_14a37fe_9111_cov_1692584941_test4.amv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 18:16:02 +0000 (19:16 +0100)]
avcodec/takdec: always check bits_per_raw_sample
Fixes out of array access
Fixes: asan_heap-oob_19c7a94_6470_cov_1453611734_luckynight-partial.tak
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ståle Kristoffersen [Fri, 31 Jan 2014 18:05:08 +0000 (19:05 +0100)]
Auto-detect hevc in mpeg-ts.
Fixes decoding of files without PMT/PAT.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:59:14 +0000 (17:59 +0100)]
mxpeg_decode_end: zero bitmask size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:57:17 +0000 (17:57 +0100)]
avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask size
Fixes: heap array overread
Fixes: asan_heap-oob_149b2bc_6577_m1.mxg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:31:21 +0000 (17:31 +0100)]
avformat/flac_picture: clear padding area
aviod use of uninitialized memory
Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:21:32 +0000 (17:21 +0100)]
avformat/flac_picture: allocate buffer padding for picture
Fixes: heap array overread
Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 14:24:35 +0000 (15:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add xvid test for custom matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 14:16:44 +0000 (15:16 +0100)]
Merge commit '
7716dd9fbbcea2700a100c995df967d5547c2eb9 '
* commit '
7716dd9fbbcea2700a100c995df967d5547c2eb9 ':
xvid: switch to xvid mmx idct as soon as possible
Conflicts:
libavcodec/mpeg4videodec.c
Not merged, as the bug was not merged either
See:
6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f , and related commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:58:22 +0000 (14:58 +0100)]
Merge commit '
78987a88a88b28d93d03ed6c228bcb33f178444f '
* commit '
78987a88a88b28d93d03ed6c228bcb33f178444f ':
lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:52:57 +0000 (14:52 +0100)]
Merge commit '
5312818524484a995433b986a2a7a6602572d4db '
* commit '
5312818524484a995433b986a2a7a6602572d4db ':
atrac3plus: Make initialization dependant on channel count rather than channel map
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:35:44 +0000 (14:35 +0100)]
Merge commit '
9ee9c679a7d444db223cf932e89cd39351f54f2d '
* commit '
9ee9c679a7d444db223cf932e89cd39351f54f2d ':
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
See:
cd86eb265f36a79d2996f44ba7ec7e7acbc99f81
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:29:48 +0000 (14:29 +0100)]
Merge commit '
51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2 '
* commit '
51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2 ':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See:
1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 29 Jan 2014 17:36:24 +0000 (18:36 +0100)]
fate: add xvid test for custom matrices
Test sample is made from the sample in Bug-Id: videolan/7411
Janne Grunau [Wed, 29 Jan 2014 16:36:40 +0000 (17:36 +0100)]
xvid: switch to xvid mmx idct as soon as possible
The idct implementation cannot be changed after the quantization matrices
are read since it use a different permutaion.
Bug-Id: videolan/7411
Janne Grunau [Wed, 29 Jan 2014 14:12:48 +0000 (15:12 +0100)]
lavf: include 60 fps in guessed standard frame rates
Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().
Jan Ekström [Thu, 30 Jan 2014 08:37:53 +0000 (08:37 +0000)]
atrac3plus: Make initialization dependant on channel count rather than channel map
Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding,
which is needed in multimedia frameworks, as well as in general cases
where demuxing and decoding are separate entities.
Michael Niedermayer [Fri, 31 Jan 2014 02:27:37 +0000 (03:27 +0100)]
doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returns
Fixed CID1135755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 01:56:39 +0000 (02:56 +0100)]
avformat/hdsenc: check mkdir() return code
This also returns failure if the mkdir failure is not due to an already existing
path.
Fixed CID1135749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Jan 2014 19:26:36 +0000 (20:26 +0100)]
ffmpeg: print data size too in statistic
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 30 Jan 2014 23:48:31 +0000 (00:48 +0100)]
doc/APIchanges: apply minor formatting fixes
James Darnley [Thu, 30 Jan 2014 13:58:18 +0000 (14:58 +0100)]
Changelog: add entries relating to metadata_header_padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Jan 2014 19:16:29 +0000 (20:16 +0100)]
ffmpeg: also count data streams bytes
Fixes wrong error message about empty output file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 30 Jan 2014 18:01:30 +0000 (19:01 +0100)]
x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}().
5.40s → 5.30s overall decode time with -threads 1 on ped1080p.webm
(i7 920, ssse3)
Michael Niedermayer [Thu, 30 Jan 2014 15:00:47 +0000 (16:00 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Thu, 24 Oct 2013 10:54:32 +0000 (06:54 -0400)]
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Thu, 30 Jan 2014 14:19:51 +0000 (15:19 +0100)]
Merge commit '
a17ab0e46a9fec7c31cc1be363828184c6ecebf7 '
* commit '
a17ab0e46a9fec7c31cc1be363828184c6ecebf7 ':
doc: add decoders.texi
Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi
See:
5e45f03420945dfeaf66729f5d022e5c15ff5723
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Jan 2014 13:55:03 +0000 (14:55 +0100)]
Merge commit '
23d461fe8714a20ee5e6929f22c61512fdda568e '
* commit '
23d461fe8714a20ee5e6929f22c61512fdda568e ':
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 30 Jan 2014 11:15:28 +0000 (12:15 +0100)]
Add rangecoder to the sonic dependencies in configure.
Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.
Carl Eugen Hoyos [Wed, 29 Jan 2014 23:55:35 +0000 (00:55 +0100)]
Warn the user if mjpeg cbr encoding with frame threading was requested.
Michael Niedermayer [Wed, 29 Jan 2014 23:55:22 +0000 (00:55 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Force automatic thread_count to 1 for cbr mjpeg frame threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Jan 2014 23:25:31 +0000 (00:25 +0100)]
avcodec/mjpegdec: use av_freep() instead of av_free()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Jan 2014 23:24:34 +0000 (00:24 +0100)]
avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 29 Jan 2014 23:22:25 +0000 (00:22 +0100)]
Force automatic thread_count to 1 for cbr mjpeg frame threading.
Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.
Kirill Gavrilov [Wed, 29 Jan 2014 17:22:24 +0000 (21:22 +0400)]
mjpegdec: parse JPS extension and save relevant stereo3d information
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Jan 2014 22:40:39 +0000 (23:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Sun, 26 Jan 2014 14:55:26 +0000 (14:55 +0000)]
doc: document correct option to list encoders
John Stebbins [Sun, 26 Jan 2014 14:49:10 +0000 (14:49 +0000)]
doc: add decoders.texi
Only documents ac3 decoder options at this point.
John Stebbins [Mon, 13 Jan 2014 17:04:30 +0000 (17:04 +0000)]
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
Amplification of quiet sounds is enhanced.
Inspired by gbooker's A52Decoder.
Michael Niedermayer [Wed, 29 Jan 2014 16:05:12 +0000 (17:05 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 16 Jan 2014 00:55:38 +0000 (01:55 +0100)]
avformat: utils: Refactor duplicated PRINT macro
Diego Biurrun [Wed, 29 Jan 2014 13:14:46 +0000 (14:14 +0100)]
mpeg: Drop unused parameters from ff_draw_horiz_band()
Carl Eugen Hoyos [Wed, 29 Jan 2014 08:59:45 +0000 (09:59 +0100)]
Remove now unneeded Makefile dependency for the wtv muxer.
Michael Niedermayer [Wed, 29 Jan 2014 04:44:03 +0000 (05:44 +0100)]
avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb are reached
This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Jan 2014 04:43:39 +0000 (05:43 +0100)]
avformat/mpegts: drop stray space
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 28 Jan 2014 23:48:50 +0000 (00:48 +0100)]
Support writing E-AC3 in wav.
Carl Eugen Hoyos [Tue, 28 Jan 2014 23:44:59 +0000 (00:44 +0100)]
Move GUID-related objects to riffenc.c and riff.c.
This simplifies the following eac3-in-wav patch.
Carl Eugen Hoyos [Tue, 28 Jan 2014 21:39:45 +0000 (22:39 +0100)]
Add elbg Makefile dependency to the cinepak encoder.
Michael Niedermayer [Tue, 28 Jan 2014 19:49:38 +0000 (20:49 +0100)]
avfilter/vf_colormatrix: update output AVFrame colorspace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jan 2014 17:40:23 +0000 (18:40 +0100)]
avfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mikael Finstad [Mon, 27 Jan 2014 10:05:27 +0000 (11:05 +0100)]
avformat/hls: Fix cookies and user agent with encrypted HLS streams
Session data (cookies, user-agent) is not being sent on payload requests with
encrypted HLS streams This causes services like Akamai to give a 403 forbidden
when requesting the TS files, because they expect the same cookies
and user-agent on all requests
Lukasz Marek [Tue, 28 Jan 2014 16:35:49 +0000 (17:35 +0100)]
doc/general: update device and protocol status
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 28 Jan 2014 10:41:31 +0000 (11:41 +0100)]
MAINTAINERS: add myself as opengl_enc.c maintainer
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 28 Jan 2014 10:41:30 +0000 (11:41 +0100)]
doc/APIchanges: add avdevice_*_control_message functions
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Jan 2014 03:02:35 +0000 (04:02 +0100)]
avcodec/huffyuvenc: frame multi-threading support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 28 Jan 2014 07:59:45 +0000 (04:59 -0300)]
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_sse2()
Similar gains as the ssse3 version once again
Signed-off-by: James Almer <jamrial@gmail.com>
Clément Bœsch [Sat, 25 Jan 2014 16:38:42 +0000 (17:38 +0100)]
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_{ssse3,avx}.
9680 decicycles in loop_filter_v_88_16_c,
4193765 runs, 539 skips
9233 decicycles in loop_filter_h_88_16_c,
4193751 runs, 553 skips
1929 decicycles in ff_vp9_loop_filter_v_88_16_ssse3,
4194118 runs, 186 skips
2738 decicycles in ff_vp9_loop_filter_h_88_16_ssse3,
4193861 runs, 443 skips
5.978 → 5.417 overall decode time on ped1080p.webm (-threads 1)
Adding SSE2 support should be relatively trivial (just a matter of
changing the pshufb [mask_mix] with something else), patch welcome.
Michael Niedermayer [Mon, 27 Jan 2014 23:27:57 +0000 (00:27 +0100)]
avcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Jan 2014 22:45:14 +0000 (23:45 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd: add opengl device
lavd: add avdevice_dev_to_app_control_message API
lavd: add avdevice_app_to_dev_control_message API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Jan 2014 13:46:11 +0000 (14:46 +0100)]
avcodec/libfdk-aacenc: change MODE_7_1_FRONT_CENTER to map to AV_CH_LAYOUT_7POINT1_WIDE_BACK
This was suggested by Rodeo on IRC
<Rodeo> for consistency with the rest, MODE_7_1_FRONT_CENTER would be AV_CH_LAYOUT_7POINT1_WIDE_BACK (since LS+RS is mapped to back channels in other modes)
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Jan 2014 13:44:27 +0000 (14:44 +0100)]
avcodec/libfdk-aacenc: change MODE_7_1_REAR_SURROUND to map to AV_CH_LAYOUT_7POINT1
This was suggested by Rodeo on IRC
<Rodeo> sorry, I meant MODE_7_1_REAR_SURROUND would probably be AV_CH_LAYOUT_7POINT1
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 25 Jan 2014 18:04:56 +0000 (19:04 +0100)]
x86/vp9lpf: add a preload system in FILTER_UPDATE.
Allow some macro refactoring in filter14().
Clément Bœsch [Sat, 25 Jan 2014 14:55:27 +0000 (15:55 +0100)]
x86/vp9lpf: refactor v/h using common macros for P7 to Q7.
Clément Bœsch [Sat, 25 Jan 2014 14:32:42 +0000 (15:32 +0100)]
x86/vp9lpf: faster P7..Q7 accesses.
Introduce 2 additional registers for stride3 and mstride3 to allow
direct accesses (lea drops).
3931 → 3827 decicycles in ff_vp9_loop_filter_v_16_16_ssse3
Also uses defines to clarify the code.
Lukasz Marek [Sun, 24 Nov 2013 19:13:27 +0000 (20:13 +0100)]
lavd: add opengl device
It can render to OpenGL context provided by application or into SDL window
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sun, 19 Jan 2014 15:12:07 +0000 (16:12 +0100)]
lavd: add avdevice_dev_to_app_control_message API
New API allows to send messages from devices to application.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sun, 19 Jan 2014 15:11:09 +0000 (16:11 +0100)]
lavd: add avdevice_app_to_dev_control_message API
New API allows to send messages from application to devices.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Carl Eugen Hoyos [Mon, 27 Jan 2014 13:28:30 +0000 (14:28 +0100)]
Fix decoding of some 8 < bpc < 16 signed j2k samples with libopenjpeg.
No testcase known.
Reviewed-by: Michael Bradshaw
Rainer Hochecker [Mon, 27 Jan 2014 07:16:13 +0000 (08:16 +0100)]
dxva2: bump maximum number of slieces for mpeg2
Suggested by heleppkes on https://trac.ffmpeg.org/ticket/3133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 5 Oct 2013 14:10:41 +0000 (16:10 +0200)]
ffplay: remove redundant prototype
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Jan 2014 01:05:13 +0000 (02:05 +0100)]
avcodec/huffyuv: support gbrp9/10/12/14
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Jan 2014 00:45:57 +0000 (01:45 +0100)]
avcodec/huffyuv: update years in copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>