7618d360ca
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
15fda8bcf1
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
ecf5526578
Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'
* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
vc1: Use logical instead of bitwise or for twomv
See: 1e2ab98460
11 years ago
bde8eb7fa3
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
7703995a2e
flac: Remove unused headers
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
cc4992aaf3
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
This is actually defined in the A/52 specification.
12 years ago
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.
12 years ago
b39ebcddd4
fate: Add VC-1 interlaced twomv test
CC: libav-stable@libav.org
11 years ago
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>
11 years ago
b5fe13448b
vc1: Use logical instead of bitwise or for coded_inter
This appears to be the intended behavior.
11 years ago
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>
11 years ago
ee2e5acdb1
avcodec/dxtory: remove unused variables
Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4c57be124f
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
b0458e62c8
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'
* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
caf: Give context structure a consistent name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f2254e36c0
lavd/avfoundation: Use microseconds as common timebase.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
b97f6ef956
pcm-dvd: Move a variable to a smaller scope
This avoids an unused variable warning on big-endian systems.
11 years ago
9ae83ece8a
avformat/srtdec: simpler and more lenient probing
Fixes Ticket #3935 .
11 years ago
7dd2005e1a
avformat: add SUP/PGS subtitle demuxer
Signed-off-by: Clément Bœsch <u@pkh.me>
11 years ago
4d5b99dacd
caf: Give context structure a consistent name
11 years ago
1ea7a3e04e
lavd/avfoundation: Simplify debug message generation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
92827e1869
lavd/avfoundation: Using the actual stream index instead of hardcoded value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a69c70e148
lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
88c937fdc8
Autodetect jpg images.
Based on 2d3842f5#2541 .
11 years ago
475e3799cd
Support libopenjpeg 2.x via libopenmj2.
Based on a patch by Marius Cirsta.
Fixes ticket #2016 .
11 years ago
8de7bdd756
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
11 years ago
a43bcaafe2
avcodec/dxtory: Support dxtory-2.0.127.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c0f9df30dd
lavc/x86/idctdsp.h: Fix make checkheaders.
11 years ago
a829870b2f
avcodec/svq1enc: align buffer used by simd functions
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
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>
11 years ago
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>
11 years ago
ce6e46be72
avformat/img2dec: enable generic seeking for image pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
6d35aba167
avformat/img2dec: initialize pkt->pos for image pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2497914a18
avformat/img2dec: pass error code and signal EOF
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
1dbdcb4a8c
avformat/img2dec: fix error code at EOF for pipes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
454f98b881
Merge commit '4620affa24eedb167482198aa04126bcedd05620'
* commit '4620affa24eedb167482198aa04126bcedd05620':
m4vdec: K&R formatting cosmetics
Conflicts:
libavformat/m4vdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
59f4966756
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
lmlm4: K&R formatting cosmetics
Conflicts:
libavformat/lmlm4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
8f3d3e5f83
Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'
* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
a6fd685fed
Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'
* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
avcodec: Fix a doxy comment to refer to the right function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4620affa24
m4vdec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
86a361081d
lmlm4: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
95d312d6c8
concat: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
6441d522e9
Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'
* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
rtsp: Clear the session id on redirects
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
Tristan Matthews
Tim Walker
Peter Ross
Thilo Borgmann
Diego Biurrun
Clément Bœsch
wm4
Carl Eugen Hoyos
James Almer
Gabriel Dume
Katerina Barone-Adesi
Martin Storsjö