Tristan Matthews
7703995a2e
flac: Remove unused headers
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-26 10:33:01 -07:00
Tim Walker
cc4992aaf3
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
...
This is actually defined in the A/52 specification.
2014-09-26 17:09:14 +02:00
Tim Walker
4c2fd4b262
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.
2014-09-26 17:09:13 +02:00
Tim Walker
b39ebcddd4
fate: Add VC-1 interlaced twomv test
...
CC: libav-stable@libav.org
2014-09-26 16:55:59 +02:00
Michael Niedermayer
a97328afef
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>
2014-09-26 16:55:36 +02:00
Tim Walker
b5fe13448b
vc1: Use logical instead of bitwise or for coded_inter
...
This appears to be the intended behavior.
2014-09-26 16:18:42 +02:00
Peter Ross
1964251be7
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>
2014-09-26 12:51:40 +02:00
Michael Niedermayer
ee2e5acdb1
avcodec/dxtory: remove unused variables
...
Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:51:40 +02:00
Michael Niedermayer
4c57be124f
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
...
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:30:02 +02:00
Michael Niedermayer
b0458e62c8
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'
...
* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
caf: Give context structure a consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:24:00 +02:00
Thilo Borgmann
f2254e36c0
lavd/avfoundation: Use microseconds as common timebase.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:13:57 +02:00
Diego Biurrun
b97f6ef956
pcm-dvd: Move a variable to a smaller scope
...
This avoids an unused variable warning on big-endian systems.
2014-09-26 02:15:34 -07:00
Clément Bœsch
9ae83ece8a
avformat/srtdec: simpler and more lenient probing
...
Fixes Ticket #3935 .
2014-09-26 11:12:41 +02:00
wm4
7dd2005e1a
avformat: add SUP/PGS subtitle demuxer
...
Signed-off-by: Clément Bœsch <u@pkh.me>
2014-09-26 10:35:14 +02:00
Diego Biurrun
4d5b99dacd
caf: Give context structure a consistent name
2014-09-26 00:44:41 -07:00
Thilo Borgmann
1ea7a3e04e
lavd/avfoundation: Simplify debug message generation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 05:05:31 +02:00
Thilo Borgmann
92827e1869
lavd/avfoundation: Using the actual stream index instead of hardcoded value.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 05:05:11 +02:00
Thilo Borgmann
a69c70e148
lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 04:18:24 +02:00
Carl Eugen Hoyos
88c937fdc8
Autodetect jpg images.
...
Based on 2d3842f5
by Michael Niedermayer.
Fixes ticket #2541 .
2014-09-26 00:06:41 +02:00
Carl Eugen Hoyos
475e3799cd
Support libopenjpeg 2.x via libopenmj2.
...
Based on a patch by Marius Cirsta.
Fixes ticket #2016 .
2014-09-26 00:06:41 +02:00
Carl Eugen Hoyos
8de7bdd756
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
2014-09-26 00:06:41 +02:00
Michael Niedermayer
a43bcaafe2
avcodec/dxtory: Support dxtory-2.0.127.avi
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 23:46:56 +02:00
Carl Eugen Hoyos
c0f9df30dd
lavc/x86/idctdsp.h: Fix make checkheaders.
2014-09-25 22:18:25 +02:00
James Almer
a829870b2f
avcodec/svq1enc: align buffer used by simd functions
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-25 16:00:20 -03:00
James Almer
4b892e469b
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>
2014-09-25 16:00:16 -03:00
Thilo Borgmann
e113692c89
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>
2014-09-25 18:03:09 +02:00
Michael Niedermayer
ce6e46be72
avformat/img2dec: enable generic seeking for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 17:47:45 +02:00
Michael Niedermayer
6d35aba167
avformat/img2dec: initialize pkt->pos for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 17:16:14 +02:00
Michael Niedermayer
2497914a18
avformat/img2dec: pass error code and signal EOF
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 16:20:23 +02:00
Michael Niedermayer
1dbdcb4a8c
avformat/img2dec: fix error code at EOF for pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 15:22:42 +02:00
Michael Niedermayer
454f98b881
Merge commit '4620affa24eedb167482198aa04126bcedd05620'
...
* commit '4620affa24eedb167482198aa04126bcedd05620':
m4vdec: K&R formatting cosmetics
Conflicts:
libavformat/m4vdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 14:02:55 +02:00
Michael Niedermayer
59f4966756
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
...
* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
lmlm4: K&R formatting cosmetics
Conflicts:
libavformat/lmlm4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 13:51:43 +02:00
Michael Niedermayer
8f3d3e5f83
Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'
...
* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 13:45:30 +02:00
Michael Niedermayer
9b53691f73
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>
2014-09-25 13:37:40 +02:00
Michael Niedermayer
a6fd685fed
Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'
...
* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
avcodec: Fix a doxy comment to refer to the right function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 12:09:32 +02:00
Gabriel Dume
4620affa24
m4vdec: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-25 01:58:51 -07:00
Gabriel Dume
86a361081d
lmlm4: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-25 01:44:32 -07:00
Gabriel Dume
95d312d6c8
concat: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-25 01:44:31 -07:00
Katerina Barone-Adesi
28f5cd312c
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>
2014-09-25 01:44:31 -07:00
Martin Storsjö
d07ddc93e2
avcodec: Fix a doxy comment to refer to the right function
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-25 10:01:25 +03:00
Michael Niedermayer
303fc9b368
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>
2014-09-25 05:28:32 +02:00
James Almer
4f4f08e6f0
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>
2014-09-24 21:52:13 -03:00
James Almer
c99a882814
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>
2014-09-24 21:43:19 -03:00
Michael Niedermayer
6441d522e9
Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'
...
* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
rtsp: Clear the session id on redirects
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 01:08:44 +02:00
Michael Niedermayer
d8ddac363e
Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'
...
* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
rtpenc: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h
See: 6821a5a4ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 00:17:36 +02:00
Michael Niedermayer
b8d3f7fc21
Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
...
* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
libavformat: Move avc mp4 startcode parsing to a shared file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 00:09:42 +02:00
James Almer
ad26e83f9c
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>
2014-09-24 18:52:32 -03:00
Philip DeCamp
857fc0a71f
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>
2014-09-24 22:57:40 +02:00
Martin Storsjö
2f172f1ae9
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>
2014-09-24 23:34:02 +03:00
Thomas Volkert
ddf5fb71ee
rtpenc: HEVC/H.265 support
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-24 23:33:26 +03:00