]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 28 Sep 2014 14:13:18 +0000 (16:13 +0200)]
avutil/pca: Make argument of ff_pca_add() const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Sep 2014 13:02:14 +0000 (15:02 +0200)]
avcodec/vc1dec: Fixing is_intra, 2nd attempt
This also un-does the fate changes from
a52f443714b5c2a40ed272d8445f4c39220a4b69 ,
leaving this fix without even small differences in the output, that is
a sample for which this makes a vissible difference is very welcome
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Sep 2014 12:00:06 +0000 (14:00 +0200)]
avcodec/vc1dec: fix is_intra block vs. mb bug
Fixes CID1194380
There are no vissible differences in the changed fate samples. Only
a tiny number of pixels change by tiny amounts in the frames i checked
If someone has a file that shows a vissible difference, please post it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 21 Sep 2014 08:58:10 +0000 (09:58 +0100)]
configure: add noexecstack to linker options if supported.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Tue, 9 Sep 2014 23:38:58 +0000 (01:38 +0200)]
avcodec/libx265: enable psnr reporting when requested by the user
This is similar to what is done in libx264.c
Fixes Ticket3567
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Sep 2014 01:40:13 +0000 (03:40 +0200)]
avcodec/libx264: mark unchanged pointer arguments as const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Joakim Roubert [Mon, 22 Sep 2014 08:17:01 +0000 (10:17 +0200)]
avformat/hlsenc: Added parameter -hls_allow_cache
The -hls_allow_cache parameter enables explicitly setting the
EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates
whether the client MAY or MUST NOT cache downloaded media
segments for later replay.
Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE
will not show in the manifest for other values (or if
-hls_allow_cache is not used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Tue, 23 Sep 2014 15:06:37 +0000 (17:06 +0200)]
lavd/avfoundation: Add basic PCM audio support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 18:34:44 +0000 (20:34 +0200)]
avcodec/ac3enc_template: fix out of array read
Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 16:21:23 +0000 (18:21 +0200)]
Merge commit '
551746680462538bb5ad7adf55fb1248190428ec '
* commit '
551746680462538bb5ad7adf55fb1248190428ec ':
configure: Provide a safe default for unknonw libcs
Conflicts:
configure
This is not merged as it does not work with musl here, while
our previous solution does.
See:
170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 27 Sep 2014 15:57:23 +0000 (17:57 +0200)]
configure: Provide a safe default for unknonw libcs
Support musl out of box.
Amend commit
9d2cee52d37c7340f85a5d41110282aac03e6855 that got
wrongly merged in its stead.
Clément Bœsch [Sat, 20 Sep 2014 20:30:26 +0000 (22:30 +0200)]
avcodec/subviewerdec: remove old compat code
Clément Bœsch [Sat, 20 Sep 2014 20:30:11 +0000 (22:30 +0200)]
avcodec/microdvddec: remove old compat code
Clément Bœsch [Sat, 27 Sep 2014 15:49:49 +0000 (17:49 +0200)]
avformat/assdec: make sure to free allocated data in case of error
Clément Bœsch [Sat, 20 Sep 2014 19:37:01 +0000 (21:37 +0200)]
avformat/assenc: mux an event header if none are found in extradata
Clément Bœsch [Sat, 20 Sep 2014 17:31:52 +0000 (19:31 +0200)]
avformat/assdec: add myself to Copyright
Clément Bœsch [Sat, 20 Sep 2014 17:31:29 +0000 (19:31 +0200)]
avformat/assdec: reindent after previous commit
Clément Bœsch [Sat, 20 Sep 2014 17:15:31 +0000 (19:15 +0200)]
avformat/assdec: make sure "Comments:" events end up in the header
Clément Bœsch [Sun, 14 Sep 2014 07:35:10 +0000 (09:35 +0200)]
avformat/assdec: output ASS packets
After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.
And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.
lvqcl [Sat, 27 Sep 2014 11:21:31 +0000 (13:21 +0200)]
avutil/x86/cpu: fix cpuid sub-leaf selection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 11:00:25 +0000 (13:00 +0200)]
tests/fate/microsoft: add -flags +bitexact to ilaced_twomv
Should fix fate failure on alpha and pre sse2 x86
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 23 Sep 2014 21:36:41 +0000 (21:36 +0000)]
hevc: remove CodingTree
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 25 Sep 2014 17:25:00 +0000 (17:25 +0000)]
avfilter/signalstats: add more pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 26 Sep 2014 16:11:16 +0000 (18:11 +0200)]
ffplay: Separate AVFrame from AVSubtitle
This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 01:38:12 +0000 (03:38 +0200)]
Merge commit '
4e03b2097ca59843ed65424a572b7acd5345f088 '
* commit '
4e03b2097ca59843ed65424a572b7acd5345f088 ':
mpeg12: Always invoke the get_format() callback
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 01:16:58 +0000 (03:16 +0200)]
Merge commit '
ce42316321145c435029dc288c2b5f1d48519dde '
* commit '
ce42316321145c435029dc288c2b5f1d48519dde ':
h264: Always invoke the get_format() callback
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 00:42:30 +0000 (02:42 +0200)]
Merge commit '
1c80c9d7ef809180042257200c7b5f6b81d0b0e2 '
* commit '
1c80c9d7ef809180042257200c7b5f6b81d0b0e2 ':
hwaccel: Call ->get_format again if hwaccel init fails
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Sep 2014 00:12:21 +0000 (02:12 +0200)]
Merge commit '
9d2cee52d37c7340f85a5d41110282aac03e6855 '
* commit '
9d2cee52d37c7340f85a5d41110282aac03e6855 ':
configure: Assume a standard-compliant default libc
See:
170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Note, the change is not merged to avoid breaking netbsd and others.
once the netbsd (and any other breakages are dealt with the
else based solution could be used and
170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
could then be reverted)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 23:49:24 +0000 (01:49 +0200)]
Merge commit '
6cfbe1de5ac6c57c41459626f7ac32841d63ace8 '
* commit '
6cfbe1de5ac6c57c41459626f7ac32841d63ace8 ':
avconv: Use only audio and video to guess discontinuities
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 26 Sep 2014 23:46:41 +0000 (20:46 -0300)]
x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}
About two times faster than the c wrapper.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 26 Sep 2014 23:35:46 +0000 (01:35 +0200)]
Merge commit '
883e98bc25755327565d8ae0f565a6c886f24816 '
* commit '
883e98bc25755327565d8ae0f565a6c886f24816 ':
probe: Bump the score for mime type matching
Conflicts:
libavformat/format.c
See:
bcac0f401001e6ebb0ae2718cc42d30b2009de4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 23:29:24 +0000 (01:29 +0200)]
Merge commit '
d995f0a1550c9148140eab34c7d770e90925c004 '
* commit '
d995f0a1550c9148140eab34c7d770e90925c004 ':
log: Unbreak no-tty support on 256color terminals
Conflicts:
libavutil/log.c
No change, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 19:37:28 +0000 (16:37 -0300)]
libavfilter/af_amix: avoid derreferencing possible null
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241516
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 16:58:22 +0000 (13:58 -0300)]
libavfilter/af_channelmap: avoid derreferencing possible null
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241517
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 15:52:09 +0000 (12:52 -0300)]
libavfilter/af_join: avoid derreferencing possible null
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241518
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Michael Niedermayer [Fri, 26 Sep 2014 20:27:37 +0000 (22:27 +0200)]
Merge commit '
7703995a2e8760e66ff35148bf029e0f9e30dbe6 '
* commit '
7703995a2e8760e66ff35148bf029e0f9e30dbe6 ':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 20:18:07 +0000 (22:18 +0200)]
Merge commit '
cc4992aaf3dbb0af88d9727983d75636baf1f8cc '
* commit '
cc4992aaf3dbb0af88d9727983d75636baf1f8cc ':
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 20:06:46 +0000 (22:06 +0200)]
Merge commit '
4c2fd4b262347273afe97865ba451a1abde43ae6 '
* commit '
4c2fd4b262347273afe97865ba451a1abde43ae6 ':
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 19:00:27 +0000 (21:00 +0200)]
Merge commit '
b39ebcddd47daf37659796aaa7d068668086507a '
* commit '
b39ebcddd47daf37659796aaa7d068668086507a ':
fate: Add VC-1 interlaced twomv test
Note, this test is not free of artifacts on both sides of the merge
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:58 +0000 (11:59 +0300)]
mpeg12: Always invoke the get_format() callback
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:57 +0000 (11:59 +0300)]
h264: Always invoke the get_format() callback
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Rémi Denis-Courmont [Tue, 16 Sep 2014 19:17:47 +0000 (22:17 +0300)]
hwaccel: Call ->get_format again if hwaccel init fails
This allows the application to fall back on another hwaccel or,
more likely, software decoding.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Thu, 11 Sep 2014 13:48:13 +0000 (15:48 +0200)]
configure: Assume a standard-compliant default libc
Non-standard compliant libc should be supported on a per-case basis
anyway.
Luca Barbato [Sat, 13 Sep 2014 00:00:32 +0000 (02:00 +0200)]
avconv: Use only audio and video to guess discontinuities
Data and subtitle streams might cause false positive.
Andreas Cadhalpun [Fri, 12 Sep 2014 23:25:22 +0000 (01:25 +0200)]
probe: Bump the score for mime type matching
It should be more trustworthy than extension matching.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Fri, 12 Sep 2014 22:26:21 +0000 (00:26 +0200)]
log: Unbreak no-tty support on 256color terminals
Michael Niedermayer [Fri, 26 Sep 2014 18:53:48 +0000 (20:53 +0200)]
Merge commit '
a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab '
* commit '
a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab ':
vc1: Use logical instead of bitwise or for twomv
See:
1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 18:47:11 +0000 (20:47 +0200)]
Merge commit '
b5fe13448b13bfdd48a75b7e12387e11e3526d7c '
* commit '
b5fe13448b13bfdd48a75b7e12387e11e3526d7c ':
vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tristan Matthews [Fri, 12 Sep 2014 22:50:03 +0000 (18:50 -0400)]
flac: Remove unused headers
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Tim Walker [Tue, 18 Feb 2014 02:39:52 +0000 (03:39 +0100)]
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
This is actually defined in the A/52 specification.
Tim Walker [Tue, 18 Feb 2014 02:39:51 +0000 (03:39 +0100)]
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Some encoders already use this value even
though it's reserved in the A/52 specification.
Tim Walker [Sun, 21 Sep 2014 15:16:33 +0000 (16:16 +0100)]
fate: Add VC-1 interlaced twomv test
CC: libav-stable@libav.org
Michael Niedermayer [Sun, 21 Sep 2014 15:16:32 +0000 (16:16 +0100)]
vc1: Use logical instead of bitwise or for twomv
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Tim Walker [Thu, 25 Sep 2014 16:34:26 +0000 (18:34 +0200)]
vc1: Use logical instead of bitwise or for coded_inter
This appears to be the intended behavior.
Peter Ross [Fri, 26 Sep 2014 05:44:46 +0000 (15:44 +1000)]
libavformat/iff: print error message when DSDIFF compression type is not supported
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 10:47:21 +0000 (12:47 +0200)]
avcodec/dxtory: remove unused variables
Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 10:29:41 +0000 (12:29 +0200)]
Merge commit '
b97f6ef956293fe06ae1e99bd295f42613081f37 '
* commit '
b97f6ef956293fe06ae1e99bd295f42613081f37 ':
pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 26 Sep 2014 10:23:55 +0000 (12:23 +0200)]
Merge commit '
4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2 '
* commit '
4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2 ':
caf: Give context structure a consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Tue, 23 Sep 2014 14:49:59 +0000 (16:49 +0200)]
lavd/avfoundation: Use microseconds as common timebase.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 26 Sep 2014 07:42:52 +0000 (00:42 -0700)]
pcm-dvd: Move a variable to a smaller scope
This avoids an unused variable warning on big-endian systems.
Clément Bœsch [Fri, 26 Sep 2014 05:29:22 +0000 (07:29 +0200)]
avformat/srtdec: simpler and more lenient probing
Fixes Ticket #3935.
wm4 [Wed, 24 Sep 2014 15:38:58 +0000 (17:38 +0200)]
avformat: add SUP/PGS subtitle demuxer
Signed-off-by: Clément Bœsch <u@pkh.me>
Diego Biurrun [Thu, 25 Sep 2014 14:42:30 +0000 (16:42 +0200)]
caf: Give context structure a consistent name
Thilo Borgmann [Tue, 23 Sep 2014 14:49:16 +0000 (16:49 +0200)]
lavd/avfoundation: Simplify debug message generation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Tue, 23 Sep 2014 14:48:06 +0000 (16:48 +0200)]
lavd/avfoundation: Using the actual stream index instead of hardcoded value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Wed, 24 Sep 2014 10:16:31 +0000 (12:16 +0200)]
lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 25 Sep 2014 21:02:06 +0000 (23:02 +0200)]
Autodetect jpg images.
Based on
2d3842f5 by Michael Niedermayer.
Fixes ticket #2541.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:35:39 +0000 (22:35 +0200)]
Support libopenjpeg 2.x via libopenmj2.
Based on a patch by Marius Cirsta.
Fixes ticket #2016.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:33:31 +0000 (22:33 +0200)]
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
Michael Niedermayer [Thu, 25 Sep 2014 21:42:03 +0000 (23:42 +0200)]
avcodec/dxtory: Support dxtory-2.0.127.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:18:25 +0000 (22:18 +0200)]
lavc/x86/idctdsp.h: Fix make checkheaders.
James Almer [Thu, 25 Sep 2014 18:17:13 +0000 (15:17 -0300)]
avcodec/svq1enc: align buffer used by simd functions
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 25 Sep 2014 18:04:50 +0000 (15:04 -0300)]
x86/cavsdsp: fix buffer alignment in cavs_idct8_add_mmx()
It may be used by ff_add_pixels_clamped_sse2().
Should fix fate-cavs failures on some systems.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Thilo Borgmann [Thu, 25 Sep 2014 14:10:58 +0000 (16:10 +0200)]
lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().
Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.
Bug found by: Jonas Geistert <j.geistert@yahoo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 15:07:04 +0000 (17:07 +0200)]
avformat/img2dec: enable generic seeking for image pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 15:06:33 +0000 (17:06 +0200)]
avformat/img2dec: initialize pkt->pos for image pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 14:17:08 +0000 (16:17 +0200)]
avformat/img2dec: pass error code and signal EOF
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 13:12:27 +0000 (15:12 +0200)]
avformat/img2dec: fix error code at EOF for pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 12:02:55 +0000 (14:02 +0200)]
Merge commit '
4620affa24eedb167482198aa04126bcedd05620 '
* commit '
4620affa24eedb167482198aa04126bcedd05620 ':
m4vdec: K&R formatting cosmetics
Conflicts:
libavformat/m4vdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 11:51:43 +0000 (13:51 +0200)]
Merge commit '
86a361081d3eb4e999d75bc2a462f01d88cbd2e5 '
* commit '
86a361081d3eb4e999d75bc2a462f01d88cbd2e5 ':
lmlm4: K&R formatting cosmetics
Conflicts:
libavformat/lmlm4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 11:45:25 +0000 (13:45 +0200)]
Merge commit '
95d312d6c82e7485f43c3ddda0f369af0e41c83b '
* commit '
95d312d6c82e7485f43c3ddda0f369af0e41c83b ':
concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 11:10:00 +0000 (13:10 +0200)]
Merge commit '
28f5cd312c9da9072108edf8b7685d009374ea96 '
* commit '
28f5cd312c9da9072108edf8b7685d009374ea96 ':
fate: Switch ra4-288 test from framecrc() to pcm()
Conflicts:
tests/fate/real.mak
The test is kept disabled as it still does not pass on x86-64 due to float
rounding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 25 Sep 2014 10:09:09 +0000 (12:09 +0200)]
Merge commit '
d07ddc93e29a4fdf12cd426953a7ecd5abe5e36d '
* commit '
d07ddc93e29a4fdf12cd426953a7ecd5abe5e36d ':
avcodec: Fix a doxy comment to refer to the right function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Gabriel Dume [Tue, 23 Sep 2014 14:29:59 +0000 (10:29 -0400)]
m4vdec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Gabriel Dume [Tue, 23 Sep 2014 14:29:58 +0000 (10:29 -0400)]
lmlm4: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Gabriel Dume [Tue, 23 Sep 2014 14:29:57 +0000 (10:29 -0400)]
concat: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Katerina Barone-Adesi [Wed, 24 Sep 2014 11:51:54 +0000 (13:51 +0200)]
fate: Switch ra4-288 test from framecrc() to pcm()
The decoder is float-based and the test needs to allow for some fuzz.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Martin Storsjö [Wed, 24 Sep 2014 20:31:43 +0000 (23:31 +0300)]
avcodec: Fix a doxy comment to refer to the right function
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 25 Sep 2014 02:28:21 +0000 (04:28 +0200)]
avcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding occurs due to VBV
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 24 Sep 2014 22:53:07 +0000 (19:53 -0300)]
x86/idctdsp: port {put,add}_pixels_clamped to yasm
Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 24 Sep 2014 22:51:02 +0000 (19:51 -0300)]
avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 24 Sep 2014 22:53:36 +0000 (00:53 +0200)]
Merge commit '
2f172f1ae984b763c06069adb51d0053b3834f4b '
* commit '
2f172f1ae984b763c06069adb51d0053b3834f4b ':
rtsp: Clear the session id on redirects
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Sep 2014 22:15:26 +0000 (00:15 +0200)]
Merge commit '
ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc '
* commit '
ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc ':
rtpenc: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h
See:
6821a5a4adcb40c458356e8bb90416dd8f5dd6b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Sep 2014 22:02:52 +0000 (00:02 +0200)]
Merge commit '
a2efbecc4ed12d287cf29856418c4da4a7648d95 '
* commit '
a2efbecc4ed12d287cf29856418c4da4a7648d95 ':
libavformat: Move avc mp4 startcode parsing to a shared file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 24 Sep 2014 18:18:50 +0000 (15:18 -0300)]
avcodec/x86: use function pointers for {put,add}_pixels_clamped
Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Philip DeCamp [Wed, 24 Sep 2014 20:15:18 +0000 (16:15 -0400)]
libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address
Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 24 Sep 2014 08:31:18 +0000 (11:31 +0300)]
rtsp: Clear the session id on redirects
This fixes handling redirects in case the server provided a session
id within the redirect reply.
Signed-off-by: Martin Storsjö <martin@martin.st>
Thomas Volkert [Sun, 21 Sep 2014 10:10:42 +0000 (12:10 +0200)]
rtpenc: HEVC/H.265 support
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 24 Sep 2014 08:17:04 +0000 (11:17 +0300)]
libavformat: Move avc mp4 startcode parsing to a shared file
Signed-off-by: Martin Storsjö <martin@martin.st>
James Almer [Tue, 23 Sep 2014 21:42:35 +0000 (18:42 -0300)]
x86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2
~15% faster than sse2.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>