]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 23 Jun 2014 18:34:25 +0000 (20:34 +0200)]
Merge commit '
f23d26a6864128001b03876b0b92fffe131f2060 '
* commit '
f23d26a6864128001b03876b0b92fffe131f2060 ':
h264: avoid using uninitialized memory in NEON chroma mc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 18 Jun 2014 15:10:42 +0000 (17:10 +0200)]
h264: avoid using uninitialized memory in NEON chroma mc
Adapt commit
982b596ea6640bfe218a31f6c3fc542d9fe61c31 for the arm and
aarch64 NEON asm. 5-10% faster on Cortex-A9.
Michael Niedermayer [Mon, 23 Jun 2014 12:48:38 +0000 (14:48 +0200)]
Merge commit '
ccda51b14c0fcae2fad73a24872dce75a7964996 '
* commit '
ccda51b14c0fcae2fad73a24872dce75a7964996 ':
lzo: Handle integer overflow
Conflicts:
libavutil/lzo.c
This is basically not merging changes due to this being fixed differently
in FFmpeg
See:
d6af26c55c1ea30f85a7d9edbc373f53be1743ee
See:
cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jun 2014 12:45:47 +0000 (14:45 +0200)]
avutil/lzo: add asserts to be double sure against overflows
These asserts cannot fail since
d6af26c55c1ea30f85a7d9edbc373f53be1743ee
Based-on:
ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 01:15:28 +0000 (03:15 +0200)]
avutil/lzo: Fix integer overflow
Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)
Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb@securitymouse.com>
See:
ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jun 2014 11:54:17 +0000 (13:54 +0200)]
Merge commit '
e121ac634ba324a318f4a97f978dcfb48da6b735 '
* commit '
e121ac634ba324a318f4a97f978dcfb48da6b735 ':
indeo45: use is_indeo4 context flag instead of checking codec ID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jun 2014 11:23:41 +0000 (13:23 +0200)]
Merge commit '
c67b449bebbe0b35c73b203683e77a0a649bc765 '
* commit '
c67b449bebbe0b35c73b203683e77a0a649bc765 ':
dsputil: Split bswap*_buf() off into a separate context
Conflicts:
configure
libavcodec/4xm.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/apedec.c
libavcodec/eamad.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/huffyuvdec.c
libavcodec/motionpixels.c
libavcodec/truemotion2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 19 Jun 2014 21:26:58 +0000 (23:26 +0200)]
lzo: Handle integer overflow
get_len can overflow for specially crafted payload.
Reported-By: Don A. Baley <donb@securitymouse.com>
CC: libav-stable@libav.org
Dirk Ausserhaus [Fri, 20 Jun 2014 18:15:20 +0000 (20:15 +0200)]
indeo45: use is_indeo4 context flag instead of checking codec ID
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Michael Niedermayer [Mon, 23 Jun 2014 01:48:30 +0000 (03:48 +0200)]
Merge commit '
7b9ef8d701c319c26f7d0664fe977e176764c74e '
* commit '
7b9ef8d701c319c26f7d0664fe977e176764c74e ':
mpeg: Split error resilience bits off into a separate file
Conflicts:
configure
libavcodec/Makefile
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jun 2014 01:34:13 +0000 (03:34 +0200)]
Merge commit '
f2f2e7627f0c878d13275af5d166ec5932665e28 '
* commit '
f2f2e7627f0c878d13275af5d166ec5932665e28 ':
Check mp3 header before calling avpriv_mpegaudio_decode_header().
Conflicts:
libavformat/mp3enc.c
See:
2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jun 2014 01:05:02 +0000 (03:05 +0200)]
Merge commit '
44127546b0a81dc9dd6190739a62d48f0044c6f3 '
* commit '
44127546b0a81dc9dd6190739a62d48f0044c6f3 ':
Check if an mp3 header is using a reserved sample rate.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 13 Feb 2014 16:57:05 +0000 (17:57 +0100)]
dsputil: Split bswap*_buf() off into a separate context
Diego Biurrun [Fri, 20 Jun 2014 13:05:45 +0000 (06:05 -0700)]
mpeg: Split error resilience bits off into a separate file
Justin Ruggles [Sun, 22 Jun 2014 17:19:36 +0000 (13:19 -0400)]
Check mp3 header before calling avpriv_mpegaudio_decode_header().
As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.
CC:libav-stable@libav.org
Justin Ruggles [Sun, 22 Jun 2014 17:11:32 +0000 (13:11 -0400)]
Check if an mp3 header is using a reserved sample rate.
Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.
Bug-Id: 705
CC:libav-stable@libav.org
James Almer [Sun, 22 Jun 2014 23:34:14 +0000 (20:34 -0300)]
x86/dsputil: remove redundant global motion compensation code
The SSE version has been no different than the mmx one since commit
a41bf09d
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Jun 2014 00:04:44 +0000 (02:04 +0200)]
avcodec/apedec: optimize sign combination
48078630 ->
32533850 dezi cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 23:30:35 +0000 (01:30 +0200)]
Merge commit '
463a7cde563fd805864c48a76dd1b03fc24671ed '
* commit '
463a7cde563fd805864c48a76dd1b03fc24671ed ':
Differentiate assembler and assembly in documentation and comments
Conflicts:
configure
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 23:20:55 +0000 (01:20 +0200)]
Merge commit '
0ef256d51518f0e483c38b9ee3b993cf0709d00e '
* commit '
0ef256d51518f0e483c38b9ee3b993cf0709d00e ':
libx264: Correctly manage constant rate factor params
Conflicts:
libavcodec/libx264.c
See:
3a1c8951bc886e8af30e09dc0e20491f6f5c3937
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 23:13:52 +0000 (01:13 +0200)]
Merge commit '
73953df71a28e94d8959facba7906cf5975ca4ef '
* commit '
73953df71a28e94d8959facba7906cf5975ca4ef ':
Replace av_malloc() and memset(0) by av_mallocz()
Conflicts:
libavformat/matroskadec.c
libavformat/rmdec.c
libavformat/utils.c
No change, as none of the split malloc+memset existed in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 23:03:21 +0000 (01:03 +0200)]
Merge commit '
f83896abda1e78ebbbda0f184b682b4fabadc682 '
* commit '
f83896abda1e78ebbbda0f184b682b4fabadc682 ':
ape: Replace memset(0) by zero initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:57:41 +0000 (00:57 +0200)]
Merge commit '
8d695dc411c1ae28477f107d6f7bf2db59af95df '
* commit '
8d695dc411c1ae28477f107d6f7bf2db59af95df ':
mpeg: Mark ff_mpeg_set_erpic() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:51:54 +0000 (00:51 +0200)]
Merge commit '
a6a675a79287565c3c23455439b114676b63a96c '
* commit '
a6a675a79287565c3c23455439b114676b63a96c ':
configure: Drop stray error resilience dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:45:58 +0000 (00:45 +0200)]
Merge commit '
fbf4d2197f35bddccec00ad53185ee4ab81778a0 '
* commit '
fbf4d2197f35bddccec00ad53185ee4ab81778a0 ':
build: Record explicit dependency of intrax8 on error resilience
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:39:53 +0000 (00:39 +0200)]
Merge commit '
c54e118722cbbdc04945538d1796d4472a1ff406 '
* commit '
c54e118722cbbdc04945538d1796d4472a1ff406 ':
build: Have the eatqi decoder depend on the MPEG-1 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:31:22 +0000 (00:31 +0200)]
Merge commit '
85d805d5cccb2f57e7f2e2254d7a870f05926cfd '
* commit '
85d805d5cccb2f57e7f2e2254d7a870f05926cfd ':
build: Add missing object files for webm muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:19:41 +0000 (00:19 +0200)]
Merge commit '
03391b5432a2b8b8dbc3d2db722a54dfb68737b9 '
* commit '
03391b5432a2b8b8dbc3d2db722a54dfb68737b9 ':
build: Add missing object files for Matroska demuxer
Conflicts:
libavcodec/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 22:13:34 +0000 (00:13 +0200)]
Merge commit '
49470b9404583ab3aff6835f78a759349d331696 '
* commit '
49470b9404583ab3aff6835f78a759349d331696 ':
build: Add missing replaygain object file for CAF demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 21:54:51 +0000 (23:54 +0200)]
ffmpeg: fix reinitializing with threads while flushing
With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost
This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time
Fixes hqx fate with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 18 Jun 2014 14:21:00 +0000 (16:21 +0200)]
Differentiate assembler and assembly in documentation and comments
The language and the program that consumes the language are not the same.
Anshul Maheshwari [Sun, 22 Jun 2014 07:24:33 +0000 (12:54 +0530)]
ffmpeg: fix transcoding dvbsub to dvbsub
fix ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sun, 22 Jun 2014 07:24:33 +0000 (12:54 +0530)]
avcodec/dvbsubdec: support returning exact end times
fixess part of ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 21 Jun 2014 10:46:19 +0000 (12:46 +0200)]
libx264: Correctly manage constant rate factor params
By default they are set to -1.
Michael Niedermayer [Sun, 22 Jun 2014 18:49:00 +0000 (20:49 +0200)]
avfilter/vf_blend: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 18:48:43 +0000 (20:48 +0200)]
avfilter/unsharp_opencl: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 22 Jun 2014 17:47:54 +0000 (14:47 -0300)]
x86/audiodsp: move asm code out of dsputil
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sun, 22 Jun 2014 14:31:09 +0000 (17:31 +0300)]
drawtext: drop unused draw_glyphs() arg "rgbcolor"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 19 Jun 2014 22:04:36 +0000 (00:04 +0200)]
Replace av_malloc() and memset(0) by av_mallocz()
Diego Biurrun [Thu, 19 Jun 2014 22:04:00 +0000 (00:04 +0200)]
ape: Replace memset(0) by zero initialization
Michael Niedermayer [Sun, 22 Jun 2014 15:58:28 +0000 (17:58 +0200)]
Merge commit '
9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 '
* commit '
9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 ':
dsputil: Split audio operations off into a separate context
Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 20 Jun 2014 12:25:12 +0000 (05:25 -0700)]
mpeg: Mark ff_mpeg_set_erpic() static
It is not used outside of the file.
Diego Biurrun [Thu, 19 Jun 2014 15:15:50 +0000 (08:15 -0700)]
configure: Drop stray error resilience dependencies
Diego Biurrun [Fri, 20 Jun 2014 12:53:53 +0000 (05:53 -0700)]
build: Record explicit dependency of intrax8 on error resilience
Diego Biurrun [Fri, 20 Jun 2014 12:55:11 +0000 (05:55 -0700)]
build: Have the eatqi decoder depend on the MPEG-1 decoder
eatqi uses more than just the shared mpegvideo bits.
Diego Biurrun [Fri, 20 Jun 2014 10:31:32 +0000 (03:31 -0700)]
build: Add missing object files for webm muxer
Diego Biurrun [Fri, 20 Jun 2014 10:22:10 +0000 (03:22 -0700)]
build: Add missing object files for Matroska demuxer
Diego Biurrun [Fri, 20 Jun 2014 10:15:38 +0000 (03:15 -0700)]
build: Add missing replaygain object file for CAF demuxer
Diego Biurrun [Thu, 16 Jan 2014 16:30:19 +0000 (17:30 +0100)]
dsputil: Split audio operations off into a separate context
Ronald S. Bultje [Sat, 21 Jun 2014 21:09:29 +0000 (17:09 -0400)]
swr: remove another forgotten division in DSP function.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 03:17:23 +0000 (05:17 +0200)]
avfilter/vf_hqx: remove << 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 03:02:04 +0000 (05:02 +0200)]
fate/filter-video: fix hqx on big endian part 2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 02:55:17 +0000 (04:55 +0200)]
avfilter/vf_hqx: partly fix big endian fate test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 01:03:12 +0000 (03:03 +0200)]
swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding
This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Jun 2014 00:32:30 +0000 (02:32 +0200)]
swscale/x86/input: prevent RGB32_TO_UV_FN from reading into the padding
This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Jun 2014 21:05:43 +0000 (23:05 +0200)]
avfilter/deshake_opencl: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Jun 2014 21:04:20 +0000 (23:04 +0200)]
avfilter/avf_showspectrum: fix macro ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 21 Jun 2014 20:34:13 +0000 (22:34 +0200)]
avfilter/hqx: add some self promotion in doxy.
This is useful to understand how it's different from the original code.
Clément Bœsch [Sat, 21 Jun 2014 20:32:49 +0000 (22:32 +0200)]
avfilter/hqx: unroll the pattern calculation
Code si smaller, no speed difference.
Michael Niedermayer [Sat, 21 Jun 2014 18:27:45 +0000 (20:27 +0200)]
avformat/flvdec: give live_flvdec a separate name
This should fix a infinite loop on freebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 21 Jun 2014 17:35:06 +0000 (19:35 +0200)]
Show duration for large asf files as written in the file header.
Fixes ticket #3428.
Carl Eugen Hoyos [Sat, 21 Jun 2014 17:34:10 +0000 (19:34 +0200)]
Do not show libzvbi in the configure output if it was not enabled.
It is already shown in the list of external libraries if it was enabled.
Clément Bœsch [Fri, 7 Jun 2013 08:57:29 +0000 (10:57 +0200)]
avfilter: add hqx filter (hq2x, hq3x, hq4x)
Partially fixes Ticket #3404 (xbr filter remaining)
Michael Niedermayer [Sat, 21 Jun 2014 14:57:23 +0000 (16:57 +0200)]
avcodec/libtwolame: fix encoding lsf with defaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Jun 2014 12:55:32 +0000 (14:55 +0200)]
avcodec/bitstream: document the double volatile
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Sat, 21 Jun 2014 11:03:36 +0000 (13:03 +0200)]
ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 21 Jun 2014 09:53:43 +0000 (11:53 +0200)]
build: Add missing object file for Matroska demuxer
Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Sat, 21 Jun 2014 02:05:28 +0000 (04:05 +0200)]
avcodec/ituh263enc: fix advanced intra coding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 21:18:45 +0000 (23:18 +0200)]
Merge commit '
ca1e36a8e4cd416142487071dbca734567bdaddf '
* commit '
ca1e36a8e4cd416142487071dbca734567bdaddf ':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 21:02:52 +0000 (23:02 +0200)]
avcodec/utils: check sar only when width/height are set
This fixes loosing the perfectly valid SAR when width=height=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 20:20:28 +0000 (22:20 +0200)]
Merge commit '
9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 '
* commit '
9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 ':
Add av_image_check_sar() and use it to validate SAR
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 19:54:23 +0000 (21:54 +0200)]
avcodec/bitstream: try to workaround internal compiler bug in gcc 4.2
gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 19:22:30 +0000 (21:22 +0200)]
avcodec/x86/rv40dsp_init: fix () in macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 16:48:20 +0000 (18:48 +0200)]
avcodec/wavpackenc: fix () in macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Moritz Barsnick [Fri, 20 Jun 2014 08:16:01 +0000 (10:16 +0200)]
fix several typos
Vittorio Giovara [Fri, 20 Jun 2014 16:48:06 +0000 (12:48 -0400)]
h264: fix build when error resilience is disabled
Michael Niedermayer [Fri, 20 Jun 2014 16:10:26 +0000 (18:10 +0200)]
Merge commit '
d349afb07bacccb62eb5369c38d6406d2909d792 '
* commit '
d349afb07bacccb62eb5369c38d6406d2909d792 ':
dv: cosmetics, reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 16:00:42 +0000 (18:00 +0200)]
Merge commit '
650dee63c8b1e6693c6cf5983f4a5ed3f571379f '
* commit '
650dee63c8b1e6693c6cf5983f4a5ed3f571379f ':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 15:15:39 +0000 (17:15 +0200)]
Merge commit '
778111592bf5f38630858ee6dfcfd097cd6c6da9 '
* commit '
778111592bf5f38630858ee6dfcfd097cd6c6da9 ':
dvenc: initialize the profile only once, at init
Conflicts:
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 15:03:58 +0000 (17:03 +0200)]
Merge commit '
452860d7e056f9a894cac2fe52cdedeae4c38251 '
* commit '
452860d7e056f9a894cac2fe52cdedeae4c38251 ':
Use av_packet_rescale_ts() to simplify code.
Conflicts:
doc/examples/muxing.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Jun 2014 14:40:04 +0000 (16:40 +0200)]
Merge commit '
874390e163427c1fe7682ab27924a7843780dbb3 '
* commit '
874390e163427c1fe7682ab27924a7843780dbb3 ':
lavc: add a convenience function for rescaling timestamps in a packet
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Mon, 28 Apr 2014 20:08:33 +0000 (16:08 -0400)]
Add av_image_check_sar() and use it to validate SAR
James Almer [Thu, 19 Jun 2014 05:31:46 +0000 (02:31 -0300)]
configure: remove superfluous check for AVX/FMA3 support in Yasm
The minimum Yasm/NASM version required to compile ffmpeg supports both
instruction sets
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 20 Jun 2014 02:10:29 +0000 (19:10 -0700)]
doc: remove RELEASE_NOTES
It hasn't been used since 0.11, and it does not contain any useful
information except for the code name.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 18 Jun 2014 09:02:24 +0000 (11:02 +0200)]
dv: cosmetics, reindent
Anton Khirnov [Wed, 18 Jun 2014 08:59:37 +0000 (10:59 +0200)]
dv: get rid of global non-const tables
Instead, store them in the context and compute on each parameter change.
Anton Khirnov [Wed, 18 Jun 2014 08:39:13 +0000 (10:39 +0200)]
dvenc: initialize the profile only once, at init
We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.
Anton Khirnov [Wed, 18 Jun 2014 07:43:27 +0000 (09:43 +0200)]
Use av_packet_rescale_ts() to simplify code.
Anton Khirnov [Wed, 18 Jun 2014 07:39:32 +0000 (09:39 +0200)]
lavc: add a convenience function for rescaling timestamps in a packet
Stefano Sabatini [Mon, 9 Jun 2014 17:32:37 +0000 (19:32 +0200)]
lavc/h264_slice: clarify informational message in case of disabled slice multi-threaded decoding
Also suggest what can be done to workaround the limitation.
Stefano Sabatini [Mon, 9 Jun 2014 17:02:53 +0000 (19:02 +0200)]
doc/codecs: extend documentation for thread_type option
Based on avcodec.h documentation.
Timothy Gu [Tue, 10 Jun 2014 04:46:37 +0000 (21:46 -0700)]
tests/fate.sh: report different status for different errors
The order of error codes will be useful in my future fateserver patches.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 21:47:07 +0000 (23:47 +0200)]
Merge commit '
440842c4eb1d7709654ec97cd687663d11ef499c '
* commit '
440842c4eb1d7709654ec97cd687663d11ef499c ':
stereo3d: add missing include guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 21 Apr 2014 00:33:35 +0000 (02:33 +0200)]
stereo3d: add missing include guards
James Almer [Thu, 19 Jun 2014 20:28:26 +0000 (17:28 -0300)]
alpha/blockdsp: move clear_blocks out of dsputil
The blockdsp split did not cover Alpha optimizations
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gaullier Nicolas [Thu, 19 Jun 2014 17:26:31 +0000 (17:26 +0000)]
avformat/utils: better probing for duration in estimate_timings_from_pts()
It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 17:49:26 +0000 (19:49 +0200)]
avcodec/h264: Use named identifier for single thread fall-back return from ff_h264_decode_slice_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 19 Jun 2014 16:45:13 +0000 (18:45 +0200)]
s86/scale: Do not return the result of a (void) function from a void function.
Fixes compilation with Sun C 5.12.
Reported by Bradley Mitchell in ticket #3649.
James Almer [Thu, 19 Jun 2014 16:29:43 +0000 (13:29 -0300)]
x86/blockdsp: restore author attribution
See commits
649c00c96d7044aed46d70623e47d7434318e6b9
5fecfb7d58a12baf326e99f2d071060f2638d93c
73b02e24604961e49a63ca34203d8f6c56612117
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Jun 2014 16:00:20 +0000 (18:00 +0200)]
Merge commit '
852c329a69ddfd635807f60454df07d021c64901 '
* commit '
852c329a69ddfd635807f60454df07d021c64901 ':
configure: Drop duplicate pkg-config entry from help output
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>