Michael Niedermayer
5a5d454dcc
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>
10 years ago
Reynaldo H. Verdejo Pinochet
a9ea79bb49
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>
10 years ago
Reynaldo H. Verdejo Pinochet
32288234a2
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>
10 years ago
Reynaldo H. Verdejo Pinochet
e3e051c42c
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>
10 years ago
Michael Niedermayer
7618d360ca
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
...
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c895fa7f66
Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'
...
* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
15fda8bcf1
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
...
* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b7caf89401
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>
10 years ago
Rémi Denis-Courmont
4e03b2097c
mpeg12: Always invoke the get_format() callback
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
10 years ago
Rémi Denis-Courmont
ce42316321
h264: Always invoke the get_format() callback
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
10 years ago
Rémi Denis-Courmont
1c80c9d7ef
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>
10 years ago
Luca Barbato
9d2cee52d3
configure: Assume a standard-compliant default libc
...
Non-standard compliant libc should be supported on a per-case basis
anyway.
10 years ago
Luca Barbato
6cfbe1de5a
avconv: Use only audio and video to guess discontinuities
...
Data and subtitle streams might cause false positive.
10 years ago
Andreas Cadhalpun
883e98bc25
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>
10 years ago
Luca Barbato
d995f0a155
log: Unbreak no-tty support on 256color terminals
10 years ago
Michael Niedermayer
ecf5526578
Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'
...
* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
vc1: Use logical instead of bitwise or for twomv
See: 1e2ab98460
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
bde8eb7fa3
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
...
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Tristan Matthews
7703995a2e
flac: Remove unused headers
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Tim Walker
cc4992aaf3
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
...
This is actually defined in the A/52 specification.
10 years ago
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.
10 years ago
Tim Walker
b39ebcddd4
fate: Add VC-1 interlaced twomv test
...
CC: libav-stable@libav.org
10 years ago
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>
10 years ago
Tim Walker
b5fe13448b
vc1: Use logical instead of bitwise or for coded_inter
...
This appears to be the intended behavior.
10 years ago
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>
10 years ago
Michael Niedermayer
ee2e5acdb1
avcodec/dxtory: remove unused variables
...
Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4c57be124f
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
...
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b0458e62c8
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'
...
* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
caf: Give context structure a consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Thilo Borgmann
f2254e36c0
lavd/avfoundation: Use microseconds as common timebase.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
b97f6ef956
pcm-dvd: Move a variable to a smaller scope
...
This avoids an unused variable warning on big-endian systems.
10 years ago
Clément Bœsch
9ae83ece8a
avformat/srtdec: simpler and more lenient probing
...
Fixes Ticket #3935 .
10 years ago
wm4
7dd2005e1a
avformat: add SUP/PGS subtitle demuxer
...
Signed-off-by: Clément Bœsch <u@pkh.me>
10 years ago
Diego Biurrun
4d5b99dacd
caf: Give context structure a consistent name
10 years ago
Thilo Borgmann
1ea7a3e04e
lavd/avfoundation: Simplify debug message generation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Thilo Borgmann
92827e1869
lavd/avfoundation: Using the actual stream index instead of hardcoded value.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
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>
10 years ago
Carl Eugen Hoyos
88c937fdc8
Autodetect jpg images.
...
Based on 2d3842f5
by Michael Niedermayer.
Fixes ticket #2541 .
10 years ago
Carl Eugen Hoyos
475e3799cd
Support libopenjpeg 2.x via libopenmj2.
...
Based on a patch by Marius Cirsta.
Fixes ticket #2016 .
10 years ago
Carl Eugen Hoyos
8de7bdd756
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
10 years ago
Michael Niedermayer
a43bcaafe2
avcodec/dxtory: Support dxtory-2.0.127.avi
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
c0f9df30dd
lavc/x86/idctdsp.h: Fix make checkheaders.
10 years ago
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>
10 years ago
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>
10 years ago
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>
10 years ago
Michael Niedermayer
ce6e46be72
avformat/img2dec: enable generic seeking for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6d35aba167
avformat/img2dec: initialize pkt->pos for image pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
2497914a18
avformat/img2dec: pass error code and signal EOF
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1dbdcb4a8c
avformat/img2dec: fix error code at EOF for pipes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
454f98b881
Merge commit '4620affa24eedb167482198aa04126bcedd05620'
...
* commit '4620affa24eedb167482198aa04126bcedd05620':
m4vdec: K&R formatting cosmetics
Conflicts:
libavformat/m4vdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
59f4966756
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
...
* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
lmlm4: K&R formatting cosmetics
Conflicts:
libavformat/lmlm4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8f3d3e5f83
Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'
...
* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago