OSDN Git Service
Michael Niedermayer [Wed, 27 Jul 2011 08:40:34 +0000 (10:40 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: spelling cosmetics
dctref: make sure function declarations match between .c and .h file
x86: fix build with gcc 4.7
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 27 Jul 2011 00:04:53 +0000 (02:04 +0200)]
examples/muxing.c: apply misc style fixes
Stefano Sabatini [Wed, 27 Jul 2011 00:01:14 +0000 (02:01 +0200)]
examples/muxing.c: fix typo, futur -> future
Stefano Sabatini [Sun, 24 Jul 2011 13:38:59 +0000 (15:38 +0200)]
imgconvert: change logic in avcodec_get_pix_fmt_loss()
Avoid the use of the brittle/inconsistent information in
PixFmtInfo.depth, and implement a possibly more robust logic which
exposes the information in pixdesc.
Also allow the removal of PixFmtInfo.depth, since this is the only use
of it.
Stefano Sabatini [Mon, 25 Jul 2011 11:04:11 +0000 (13:04 +0200)]
lsws: remove redundant macros isSupportedIn/Out
Directly call sws_isSupportedInput/Output.
Stefano Sabatini [Mon, 25 Jul 2011 12:09:55 +0000 (14:09 +0200)]
lsws: factorize some logging code in sws_init_context()
Diego Biurrun [Wed, 13 Jul 2011 16:12:43 +0000 (18:12 +0200)]
configure: spelling cosmetics
Diego Biurrun [Wed, 13 Jul 2011 22:00:43 +0000 (00:00 +0200)]
dctref: make sure function declarations match between .c and .h file
Mans Rullgard [Tue, 26 Jul 2011 11:23:43 +0000 (12:23 +0100)]
x86: fix build with gcc 4.7
The upcoming gcc 4.7 has more advanced constant propagation
resulting some inline asm operands becoming constants and thus
emitted as literals, sometimes in contexts where this results
in invalid instructions.
This patch changes the constraints of the relevant operands
to "rm" thus forcing a valid type. While obviously suboptimal,
this is what older gcc versions already did, and there is no
change to the code generated with these.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reimar Döffinger [Tue, 26 Jul 2011 20:28:26 +0000 (22:28 +0200)]
Remove useless NULL check.
We dereferenced the pointer two lines above, no point in
checking for NULL afterwards.
In addition it cannot be NULL the way it was initialized
just one line further above.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Tue, 26 Jul 2011 13:37:11 +0000 (15:37 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ape: adjust some printf format strings to correctly match argument types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 1 Jun 2011 13:06:08 +0000 (15:06 +0200)]
ape: adjust some printf format strings to correctly match argument types
Michael Niedermayer [Mon, 25 Jul 2011 20:25:24 +0000 (22:25 +0200)]
muxer opts: fix avdict use in case of early private context alloc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Jul 2011 18:48:55 +0000 (20:48 +0200)]
ffmpeg: better timebase guessing for stream copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Jul 2011 13:50:56 +0000 (15:50 +0200)]
rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Jul 2011 13:50:13 +0000 (15:50 +0200)]
udp: allow fifo size to be tuned seperately
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 25 Jul 2011 11:02:53 +0000 (13:02 +0200)]
lsws: fix weird indent
Stefano Sabatini [Sat, 23 Jul 2011 13:37:05 +0000 (15:37 +0200)]
imgconvert: remove PixFmtInfo.pixel_type field
The field is only used for checking if a format is YUV planar
and if the format is paletted.
This patch replaces the current is_planar_yuv() code with a function
which uses the pixdesc information. The new implementation is less
efficient, but this should not be an issue as the functions which use
it (av_picture_crop/pad()) are deprecated and currently never used in
the codebase.
Stefano Sabatini [Sun, 24 Jul 2011 00:36:02 +0000 (02:36 +0200)]
lsws: use array for storing the supported in/out information
Michael Niedermayer [Sun, 24 Jul 2011 23:19:09 +0000 (01:19 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
jpegdec: actually search for and parse RSTn
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 24 Jul 2011 21:52:42 +0000 (23:52 +0200)]
Use little endian for caf codec tags.
Michael Niedermayer [Sun, 24 Jul 2011 14:22:18 +0000 (16:22 +0200)]
mpeg4_decode_profile_level: fix indention
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Jul 2011 14:21:37 +0000 (16:21 +0200)]
mpeg4videodec: simplify mpeg4_decode_profile_level()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)]
jpegdec: actually search for and parse RSTn
Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".
References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit
7b8ed831eb8432d202dad16dedc1758b018bb1fa)
Stefano Sabatini [Tue, 19 Jul 2011 10:01:48 +0000 (12:01 +0200)]
parseutils: add some documentation for small_strptime()
Stefano Sabatini [Tue, 19 Jul 2011 13:38:53 +0000 (15:38 +0200)]
imgconvert: store padded size information in PixFmtInfo, simplify avg_bits_per_pixel()
Prefer data-driven over procedural logic in avg_bits_per_pixel(),
simplify and improve robustness, as it is easy to miss a function
update when a new format is added.
Stefano Sabatini [Tue, 19 Jul 2011 12:16:04 +0000 (14:16 +0200)]
imgconvert: remove useless PixFmtInfo.nb_channels field
Michael Niedermayer [Sat, 23 Jul 2011 14:47:10 +0000 (16:47 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 17 Jul 2011 15:07:39 +0000 (17:07 +0200)]
vf_mp: remove blackframe filter wrapper
blackframe is integrated as a native filter.
Stefano Sabatini [Sat, 9 Jul 2011 13:38:23 +0000 (15:38 +0200)]
examples/encoding.c: adopt a less restrictive license
Adopt ISC (Internet Systems Consortium) license in place of LGPL,
consistent with the other examples.
Fabrice explicitely approved the relicensing.
Mans Rullgard [Thu, 21 Jul 2011 23:13:27 +0000 (00:13 +0100)]
dnxhddec: avoid a branch in 10-bit decode_dct_block()
The minimum weight value is 32 so this test can be skipped for the
10-bit case. Overall speedup 3-4%.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Daniel Kang [Fri, 22 Jul 2011 01:15:58 +0000 (21:15 -0400)]
H.264: Add optimizations to predict x86 assembly.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Alex Converse [Fri, 22 Jul 2011 17:13:22 +0000 (10:13 -0700)]
riff: Add mpgv MPEG-2 fourcc
Supported by mplayer and seen in the wild.
Kostya Shishkov [Sat, 16 Jul 2011 10:02:55 +0000 (12:02 +0200)]
add Flash Screen Video 2 decoder
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Fri, 22 Jul 2011 09:56:53 +0000 (11:56 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: optimise dnxhd_decode_dct_block()
rtp: remove disabled code
eac3enc: use different numbers of blocks per frame to allow higher bitrates
dnxhd: add regression test for 10-bit
dnxhd: 10-bit support
dsputil: update per-arch init funcs for non-h264 high bit depth
dsputil: template get_pixels() for different bit depths
dsputil: create 16/32-bit dctcoef versions of some functions
jfdctint: add 10-bit version
mov: add clcp type track as Subtitle stream.
mpeg4: add Mpeg4 Profiles names.
mpeg4: decode Level Profile for MPEG4 Part 2.
ffprobe: display bitstream level.
imgconvert: remove unused glue and xglue macros
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 21 Jul 2011 13:16:12 +0000 (15:16 +0200)]
version.sh: handle shallow clones and snapshots.
Shallow clones (--depth X) lack the N tag used to compute
the revision number: use 'git-YYYY-MM-DD-hhhhhhh' as revision,
where hhhhhhh is the short git hash.
Snapshots from gitweb do not have git information at all,
but they have the short git hash in the directory name:
append it to the release number.
Mans Rullgard [Thu, 21 Jul 2011 18:04:37 +0000 (19:04 +0100)]
dnxhddec: optimise dnxhd_decode_dct_block()
Template the function for 8/10-bit and use lowlevel bitstream
macros.
6% faster overall on i7 gcc 4.5.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Sun, 17 Jul 2011 11:27:46 +0000 (13:27 +0200)]
rtp: remove disabled code
Justin Ruggles [Thu, 14 Jul 2011 17:02:45 +0000 (13:02 -0400)]
eac3enc: use different numbers of blocks per frame to allow higher bitrates
Mans Rullgard [Wed, 20 Jul 2011 23:55:24 +0000 (00:55 +0100)]
dnxhd: add regression test for 10-bit
Signed-off-by: Mans Rullgard <mans@mansr.com>
Joseph Artsimovich [Wed, 20 Jul 2011 17:58:27 +0000 (18:58 +0100)]
dnxhd: 10-bit support
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 21 Jul 2011 09:05:15 +0000 (10:05 +0100)]
dsputil: update per-arch init funcs for non-h264 high bit depth
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 21 Jul 2011 01:31:57 +0000 (02:31 +0100)]
dsputil: template get_pixels() for different bit depths
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 21 Jul 2011 11:39:41 +0000 (12:39 +0100)]
dsputil: create 16/32-bit dctcoef versions of some functions
High bitdepth H.264 needs 32-bit transform coefficients, whereas
dnxhd does not. This creates a conflict with the templated
functions operating on DCTELEM data. This patch adds a field
allowing the caller to choose the element size in dsputil_init()
and adds the required functions.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 20 Jul 2011 19:01:56 +0000 (20:01 +0100)]
jfdctint: add 10-bit version
Signed-off-by: Mans Rullgard <mans@mansr.com>
Thierry Foucu [Thu, 21 Jul 2011 03:33:25 +0000 (20:33 -0700)]
mov: add clcp type track as Subtitle stream.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Thierry Foucu [Thu, 21 Jul 2011 03:33:24 +0000 (20:33 -0700)]
mpeg4: add Mpeg4 Profiles names.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Thierry Foucu [Thu, 21 Jul 2011 03:33:23 +0000 (20:33 -0700)]
mpeg4: decode Level Profile for MPEG4 Part 2.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Thierry Foucu [Thu, 21 Jul 2011 03:33:22 +0000 (20:33 -0700)]
ffprobe: display bitstream level.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Stefano Sabatini [Tue, 19 Jul 2011 12:23:47 +0000 (14:23 +0200)]
imgconvert: remove unused glue and xglue macros
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 21 Jul 2011 14:50:00 +0000 (16:50 +0200)]
h264: fix h264-test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 21 Jul 2011 14:27:55 +0000 (16:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv30: return AVERROR(EINVAL) instead of EINVAL
build: add -L flags before existing LDFLAGS
simple_idct: whitespace cosmetics
simple_idct: make repeated code a macro
dsputil: remove huge #if 0 block
simple_idct: change 10-bit add/put stride from pixels to bytes
dsputil: allow 9/10-bit functions for non-h264 codecs
dnxhd: rename some data tables
dnxhdenc: remove inline from function only called through pointer
dnxhdenc: whitespace cosmetics
swscale: mark YUV422P10(LE,BE) as supported for output
configure: add -xc99 to LDFLAGS for Sun CC
Remove unused and non-compiling vestigial g729 decoder
Remove unused code under G729_BITEXACT #ifdef.
mpegvideo: fix invalid picture unreferencing.
dsputil: Remove extra blank line at end.
dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
simple_idct: add 10-bit version
Conflicts:
Makefile
libavcodec/g729data.h
libavcodec/g729dec.c
libavcodec/rv30.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 21 Jul 2011 12:25:01 +0000 (14:25 +0200)]
rv30: return AVERROR(EINVAL) instead of EINVAL
On some platforms EINVAL could be positive, ensure we return negative values.
Mans Rullgard [Wed, 13 Jul 2011 17:17:54 +0000 (18:17 +0100)]
build: add -L flags before existing LDFLAGS
This ensures the linker picks the just built libraries even
if LDFLAGS for some reason contains -L flags pointing at
other directories containing libav libraries.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 21 Jul 2011 08:49:17 +0000 (09:49 +0100)]
simple_idct: whitespace cosmetics
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 21 Jul 2011 08:48:29 +0000 (09:48 +0100)]
simple_idct: make repeated code a macro
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Sun, 17 Jul 2011 15:39:05 +0000 (17:39 +0200)]
vf_mp: remove cropdetect wrapper
The cropdetect filter is natively integrated into libavfilter.
Stefano Sabatini [Sun, 17 Jul 2011 15:05:14 +0000 (17:05 +0200)]
vf_blackframe: port missing features from libmpcodecs blackframe
Use and show picref->video->pict_type and key_frame information.
The pict_type and key_frame information was not available at the time
of the port.
Stefano Sabatini [Mon, 18 Jul 2011 12:02:07 +0000 (14:02 +0200)]
au: reuse the result of the previous call to av_get_bits_per_sample()
Avoid an unnecessary call to the function, slighlty more
robust/readable.
Mans Rullgard [Thu, 21 Jul 2011 09:58:56 +0000 (10:58 +0100)]
dsputil: remove huge #if 0 block
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 21 Jul 2011 09:00:47 +0000 (11:00 +0200)]
libavfilter: fix --enable-small
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 21 Jul 2011 02:56:44 +0000 (03:56 +0100)]
simple_idct: change 10-bit add/put stride from pixels to bytes
This matches other dsputil functions and simplifies calls.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 21 Jul 2011 01:21:14 +0000 (02:21 +0100)]
dsputil: allow 9/10-bit functions for non-h264 codecs
Signed-off-by: Mans Rullgard <mans@mansr.com>
Joseph Artsimovich [Mon, 18 Jul 2011 10:21:33 +0000 (11:21 +0100)]
dnxhd: rename some data tables
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 20 Jul 2011 17:41:37 +0000 (18:41 +0100)]
dnxhdenc: remove inline from function only called through pointer
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 20 Jul 2011 17:38:37 +0000 (18:38 +0100)]
dnxhdenc: whitespace cosmetics
Signed-off-by: Mans Rullgard <mans@mansr.com>
Joseph Artsimovich [Mon, 18 Jul 2011 10:22:15 +0000 (11:22 +0100)]
swscale: mark YUV422P10(LE,BE) as supported for output
Signed-off-by: Mans Rullgard <mans@mansr.com>
Sean McGovern [Wed, 20 Jul 2011 21:25:41 +0000 (17:25 -0400)]
configure: add -xc99 to LDFLAGS for Sun CC
Using Sun's compiler on Solaris, -xc99 is as much a linker flag as a
compiler flag, so add it to LDFLAGS.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Fri, 15 Jul 2011 00:37:33 +0000 (02:37 +0200)]
Remove unused and non-compiling vestigial g729 decoder
Diego Biurrun [Wed, 20 Jul 2011 16:37:15 +0000 (18:37 +0200)]
Remove unused code under G729_BITEXACT #ifdef.
G729_BITEXACT is never set, so the code is all dead code.
Ronald S. Bultje [Wed, 20 Jul 2011 16:24:07 +0000 (09:24 -0700)]
mpegvideo: fix invalid picture unreferencing.
Mpegvideo would free frames as soon as they're not the next or prev
picture. This is fine for a single-threading model, but fails miserably
in a system where pictures can be referenced (as e.g. last/prev pic)
in other threads. Keeping track of ownership of pictures keeps image
references (e.g. motion vectors, or the reference of a motion vector)
alive as long as the picture data itself is alive.
This also happens to fix make THREADS=[3-16] fate-vsynth[12]-error.
Alex Converse [Tue, 19 Jul 2011 00:49:23 +0000 (17:49 -0700)]
dsputil: Remove extra blank line at end.
Alex Converse [Tue, 19 Jul 2011 00:48:45 +0000 (17:48 -0700)]
dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
Mans Rullgard [Wed, 20 Jul 2011 15:05:05 +0000 (16:05 +0100)]
simple_idct: add 10-bit version
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Wed, 20 Jul 2011 16:20:05 +0000 (18:20 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove h264_lowres_idct_put/add functions
Remove snow/dwt test program
h264: remove some disabled code
Fix incorrect max_lowres values
matroskadec: fix integer underflow if header length < probe length.
cosmetics: indentation
eac3enc: use frame exponent strategy when applicable.
cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
dsputil: fix ff_check_alignment()
Conflicts:
libavcodec/Makefile
libavcodec/h264idct_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 20 Jul 2011 08:46:18 +0000 (09:46 +0100)]
Remove h264_lowres_idct_put/add functions
Use of these has been broken ever since the h264 idct was changed
to always use transposed inputs. Furthermore, they were only
ever used if some *other* non-default idct was requested.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 17 Jul 2011 19:43:15 +0000 (20:43 +0100)]
Remove snow/dwt test program
This test program so full of programming errors it is impossible
to make sense of it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Sun, 17 Jul 2011 11:09:04 +0000 (13:09 +0200)]
h264: remove some disabled code
Mans Rullgard [Wed, 20 Jul 2011 08:55:48 +0000 (09:55 +0100)]
Fix incorrect max_lowres values
Signed-off-by: Mans Rullgard <mans@mansr.com>
Chris Evans [Wed, 20 Jul 2011 00:51:48 +0000 (17:51 -0700)]
matroskadec: fix integer underflow if header length < probe length.
This fixes a crash with specifically crafted files.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Erik Slagter [Mon, 18 Jul 2011 18:04:15 +0000 (20:04 +0200)]
libx264.c: distinguish between x264 parameter errors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 13 Jul 2011 16:49:15 +0000 (12:49 -0400)]
cosmetics: indentation
Justin Ruggles [Wed, 13 Jul 2011 16:20:29 +0000 (12:20 -0400)]
eac3enc: use frame exponent strategy when applicable.
This checks if the set of selected exponent strategies for all blocks in a
channel are in the frame exponent strategy table, and if so, writes the
table index instead of each strategy. This saves up to 7 bits per channel per
frame, so the overall effect on quality is small.
Justin Ruggles [Tue, 12 Jul 2011 20:44:22 +0000 (16:44 -0400)]
cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also
be used in the E-AC-3 encoder.
Michael Niedermayer [Tue, 19 Jul 2011 16:45:47 +0000 (18:45 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
simple_idct: simplify some ifdeffery
simple_idct: remove code for DCTELEM != int16
Remove VLAs in ff_amrwb_lsp2lpc()
fate: make vsynth tests depend on only the relevant vref
rtsp: remove disabled code
dsputil: restore mistakenly removed hunk of disabled code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Tue, 19 Jul 2011 09:20:56 +0000 (10:20 +0100)]
dsputil: fix ff_check_alignment()
The change to LOCAL_ALIGNED means the declared object must be an
array and the subsequent test should not use the & operator.
Noticed by Uoti Urpala.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Sat, 16 Jul 2011 08:09:17 +0000 (10:09 +0200)]
Do not use AVFMT_FLAG_NONBLOCK for the output file.
Restore the commit
0de8ebf by Carl Eugen Hoyos that was lost during the
merge
58257ea.
Mans Rullgard [Mon, 18 Jul 2011 15:04:25 +0000 (16:04 +0100)]
simple_idct: simplify some ifdeffery
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 18 Jul 2011 14:23:22 +0000 (15:23 +0100)]
simple_idct: remove code for DCTELEM != int16
DCTELEM can never be changed to anything else, too much code
depends on it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reimar Döffinger [Sun, 17 Jul 2011 11:03:57 +0000 (13:03 +0200)]
Bink: clip AC coefficients during dequantization.
Fixes artefacts with Neverwinter Nights WOTCLogo.bik
(http://drmccoy.de/zeugs/WOTCLogo.bik).
Fixes trac ticket #352.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 18 Jul 2011 17:53:36 +0000 (19:53 +0200)]
Remove a pointless/bad "static".
It has no advantage and seems to cause compile issues with
some combinations of compiler/compiler flags/PIC.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Mans Rullgard [Sun, 17 Jul 2011 10:24:34 +0000 (11:24 +0100)]
Remove VLAs in ff_amrwb_lsp2lpc()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 17 Jul 2011 18:47:58 +0000 (19:47 +0100)]
fate: make vsynth tests depend on only the relevant vref
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Sun, 17 Jul 2011 11:27:27 +0000 (13:27 +0200)]
rtsp: remove disabled code
Diego Biurrun [Mon, 18 Jul 2011 16:03:28 +0000 (18:03 +0200)]
dsputil: restore mistakenly removed hunk of disabled code
This particular part serves to document the optimized code variant.
Michael Niedermayer [Mon, 18 Jul 2011 14:43:35 +0000 (16:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
dsputil: remove disabled code
tta: remove disabled code
gxfenc: place variable declarations before statements
x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
random_seed: use proper #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ami_stuff [Mon, 18 Jul 2011 11:59:30 +0000 (13:59 +0200)]
au: add computation for duration
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Fri, 15 Jul 2011 13:40:31 +0000 (15:40 +0200)]
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sun, 17 Jul 2011 11:29:13 +0000 (13:29 +0200)]
dsputil: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:26:53 +0000 (13:26 +0200)]
tta: remove disabled code