Clément Bœsch [Thu, 24 Nov 2011 03:30:09 +0000 (04:30 +0100)]
lavu: add av_get_alt_sample_fmt().
Clément Bœsch [Thu, 24 Nov 2011 14:37:30 +0000 (15:37 +0100)]
swr: fix test program.
The number of used channels need to be reset to zero when
swr_alloc_set_opts() is called successive times.
This is a regression introduced in
c8136ebd.
Michael Niedermayer [Thu, 24 Nov 2011 14:39:41 +0000 (15:39 +0100)]
loco: Fix error handling.
Fixes null pointer dereference / http://www.google-melange.com/gci/task/view/google/gci2011/
7120335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Nov 2011 14:03:27 +0000 (15:03 +0100)]
avio: Fix handling of filenames that contain :
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sergiy Gur'yev [Thu, 24 Nov 2011 12:53:19 +0000 (14:53 +0200)]
Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Nov 2011 03:57:38 +0000 (04:57 +0100)]
ffmpeg: rewrite vsync / notimestamps handling
The qatar implementation makes no sense.
a muxer without timestamps is constant fps thus needs vsync.
the crc/mp5 are special cases that have timestamps yet allow any
nonsensical timestamps.
raw (yuv/rgb) video is constant fps thus needs vsync too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Nov 2011 01:08:21 +0000 (02:08 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavutil: add utility functions to simplify allocation of audio buffers.
libavutil: add planar sample formats and av_sample_fmt_is_planar()
avconv: fix segfault at EOF with delayed pictures
pcmdec: remove unneeded resetting of samples pointer
avconv: remove a now unused parameter from output_packet().
avconv: formatting fixes in output_packet()
avconv: declare some variables in blocks where they are used
avconv: use the same behavior when decoding audio/video/subs
bethsoftvideo: return proper consumed size for palette packets.
cdg: skip packets that don't contain a cdg command.
crcenc: add flags
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
tiffenc: add a private option for selecting compression algorithm
md5enc: add flags
ARM: remove needless .text/.align directives
Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 12 Nov 2011 20:43:43 +0000 (15:43 -0500)]
libavutil: add utility functions to simplify allocation of audio buffers.
Based on code by Stefano Sabatini.
Justin Ruggles [Sat, 12 Nov 2011 20:58:40 +0000 (15:58 -0500)]
libavutil: add planar sample formats and av_sample_fmt_is_planar()
Alexander Strasser [Wed, 23 Nov 2011 23:23:30 +0000 (00:23 +0100)]
doc: rewrite FATE documentation to be self-contained
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strasser [Wed, 23 Nov 2011 23:22:34 +0000 (00:22 +0100)]
tests: add a FATE configuration template
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 23 Nov 2011 23:18:33 +0000 (00:18 +0100)]
avconv: fix segfault at EOF with delayed pictures
At EOF it makes no sense to modify avpkt.{data,size} in output_packet
since no data is consumed. Frame threading with more than 1 threads
hits the segfault.
Michael Niedermayer [Wed, 23 Nov 2011 23:08:05 +0000 (00:08 +0100)]
vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Nov 2011 22:20:20 +0000 (23:20 +0100)]
ffmpeg: fix indention
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Nov 2011 22:19:59 +0000 (23:19 +0100)]
ffmpeg: Fix ffmpeg.c:1874:21: warning: unused variable ‘of’ [-Wunused-variable]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Nov 2011 22:03:37 +0000 (23:03 +0100)]
githowto: git is generally available as package in most distros.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 23 Nov 2011 20:32:50 +0000 (15:32 -0500)]
pcmdec: remove unneeded resetting of samples pointer
Anton Khirnov [Tue, 22 Nov 2011 06:17:38 +0000 (07:17 +0100)]
avconv: remove a now unused parameter from output_packet().
Anton Khirnov [Tue, 22 Nov 2011 06:16:23 +0000 (07:16 +0100)]
avconv: formatting fixes in output_packet()
Anton Khirnov [Tue, 22 Nov 2011 06:13:29 +0000 (07:13 +0100)]
avconv: declare some variables in blocks where they are used
Anton Khirnov [Mon, 21 Nov 2011 20:30:23 +0000 (21:30 +0100)]
avconv: use the same behavior when decoding audio/video/subs
I.e. if the packet was only partially consumed, pass the rest of it into
the decoder again.
Also simplify the code so it's the same for video/audio/subs.
Anton Khirnov [Mon, 21 Nov 2011 20:22:44 +0000 (21:22 +0100)]
bethsoftvideo: return proper consumed size for palette packets.
Also check for sufficient packet size.
Justin Ruggles [Mon, 21 Nov 2011 20:14:42 +0000 (21:14 +0100)]
cdg: skip packets that don't contain a cdg command.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 23 Nov 2011 20:56:16 +0000 (21:56 +0100)]
lavf: give more weight to the extension during probing if there is a id3
tag that is larger than the probe buffer.
Fixes Ticket336
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Nov 2011 20:55:25 +0000 (21:55 +0100)]
lavf: minor cleanup of av_probe_input_format3()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 20 Nov 2011 11:45:36 +0000 (12:45 +0100)]
crcenc: add flags
AVFMT_NOTIMESTAMPS for crc, as it ignores the timestamps.
AVFMT_VARIABLE_FPS for framecrc, as it prints dts.
Many FATE changes, because avconv is no longer duplicating frames in
those tests.
Also added -vsync 0 for some tests to prevent avconv from dropping
frames until it can be fixed more properly.
Anton Khirnov [Sun, 20 Nov 2011 11:46:24 +0000 (12:46 +0100)]
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
Prevent avconv from duplicating or dropping frames for formats where it
makes even less sense than usual, e.g. image2.
Anton Khirnov [Wed, 23 Nov 2011 18:45:39 +0000 (19:45 +0100)]
tiffenc: add a private option for selecting compression algorithm
Anton Khirnov [Sun, 20 Nov 2011 11:45:36 +0000 (12:45 +0100)]
md5enc: add flags
AVFMT_NOTIMESTAMPS for md5, as it ignores the timestamps.
AVFMT_VARIABLE_FPS for framemd5, as it prints dts.
-vsync 0 for the vp8 test is needed because with vsync 2 the timestamp
guessing code gets confused by an altref frame that is never displayed
and drops a frame later.
Mans Rullgard [Tue, 22 Nov 2011 16:53:18 +0000 (16:53 +0000)]
ARM: remove needless .text/.align directives
The 'function' macro already includes the appropriate
directives.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Wed, 23 Nov 2011 13:14:01 +0000 (14:14 +0100)]
avfilter: Error out from avfilter_merge_formats() when there are duplicates
instead of trying to continue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 Nov 2011 17:54:45 +0000 (18:54 +0100)]
vf_mp: rewrite vf_mp filter warning message
Warning text by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Nov 2011 12:18:11 +0000 (13:18 +0100)]
avfilter: dont write out of array for duplicate formats in avfilter_merge_formats()
Note, this is a theoretical fix, iam not aware of a case where this function receives
duplicates in its input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Nov 2011 03:02:17 +0000 (04:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
aacdec: Fix PS in ADTS.
avconv: Consistently use PIX_FMT_NONE.
dsputil: use cpuflags in x86 emu_edge_core
dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
mov: Remove some redundant and obsolete comments.
Add libavutil/mathematics.h #includes for INFINITY
doxy: structure libavformat groups
doxy: introduce an empty structure in libavcodec
doxy: provide a start page and document libavutil
doxy: cleanup pixfmt.h
regtest: split video encode/decode tests into individual targets
ARM: add explicit .arch and .fpu directives to asm.S
pthread: do not touch has_b_frames
avconv: cleanup the transcoding loop in output_packet().
avconv: split subtitle transcoding out of output_packet().
avconv: split video transcoding out of output_packet().
avconv: split audio transcoding out of output_packet().
avconv: reindent.
avconv: move streamcopy-only code out of decoding loop.
...
Conflicts:
avconv.c
libavcodec/aaccoder.c
libavcodec/pthread.c
libavcodec/version.h
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/mem.h
tests/ref/vsynth1/dv
tests/ref/vsynth1/mpeg2thread
tests/ref/vsynth2/dv
tests/ref/vsynth2/mpeg2thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Wed, 23 Nov 2011 00:01:03 +0000 (15:01 -0900)]
patcheck: spelling and grammar nits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Tue, 22 Nov 2011 20:12:10 +0000 (12:12 -0800)]
aacdec: Fix PS in ADTS.
Fixes File1.aac and Bug 80.
Alex Converse [Tue, 22 Nov 2011 18:38:37 +0000 (10:38 -0800)]
avconv: Consistently use PIX_FMT_NONE.
Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.
Clément Bœsch [Tue, 22 Nov 2011 20:51:20 +0000 (21:51 +0100)]
doc: add a -map_channel example for splitting channels into streams.
Justin Ruggles [Sun, 6 Nov 2011 22:42:50 +0000 (17:42 -0500)]
dsputil: use cpuflags in x86 emu_edge_core
avoids passing around the extra argument among all the macros it uses
Justin Ruggles [Mon, 7 Nov 2011 01:43:13 +0000 (20:43 -0500)]
dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
This allows emulated_edge_mc_sse() and gmc_sse() to be used under
AV_CPU_FLAG_SSE.
Michael Niedermayer [Tue, 22 Nov 2011 20:32:05 +0000 (21:32 +0100)]
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
call revert_cdlms()
Fix some loop conditions to prevent overreads
Initialize pred in lms_predict()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Nov 2011 03:34:35 +0000 (04:34 +0100)]
avio: Support private options in URLProtocols
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Tue, 22 Nov 2011 18:37:52 +0000 (13:37 -0500)]
wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
The initial values are not checked against the number of block sizes.
Initializing them to frame_len_bits will result in a block size index of 0
in these cases instead of something that might be out-of-range.
Fixes Bug 81.
Michael Niedermayer [Thu, 10 Nov 2011 16:02:02 +0000 (17:02 +0100)]
avio: allow any chars in protocols
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 28 Sep 2011 19:07:12 +0000 (21:07 +0200)]
http: add user_agent option.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Tue, 22 Nov 2011 02:46:02 +0000 (18:46 -0800)]
mov: Remove some redundant and obsolete comments.
Mans Rullgard [Sun, 17 Jul 2011 10:19:35 +0000 (11:19 +0100)]
Add libavutil/mathematics.h #includes for INFINITY
This fixes build errors in some environments.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Luca Barbato [Tue, 22 Nov 2011 16:11:28 +0000 (17:11 +0100)]
doxy: structure libavformat groups
Luca Barbato [Sun, 20 Nov 2011 20:29:52 +0000 (21:29 +0100)]
doxy: introduce an empty structure in libavcodec
Luca Barbato [Sun, 20 Nov 2011 19:38:24 +0000 (20:38 +0100)]
doxy: provide a start page and document libavutil
Introduce a basic layout, the subpages are currently left empty.
Split libavutil in multiple groups as example of the structure
Luca Barbato [Sat, 19 Nov 2011 15:57:53 +0000 (16:57 +0100)]
doxy: cleanup pixfmt.h
Remove the dubious warning about the header being private and
add some formatting
Michael Niedermayer [Tue, 22 Nov 2011 14:09:26 +0000 (15:09 +0100)]
graphparser: Fix doxy on avfilter_graph_parse() return value.
Found-by: ZacS123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 21 Nov 2011 23:02:32 +0000 (23:02 +0000)]
regtest: split video encode/decode tests into individual targets
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 15 Nov 2011 01:15:52 +0000 (01:15 +0000)]
ARM: add explicit .arch and .fpu directives to asm.S
This prevents build errors when compiler and assembler default
targets differ. Ideally each file would declare the highest
level it requires. This is however not easily possible as it
complicates assembling pre-armv6t2 code in Thumb-2 mode.
HAVE_NEON is used as indicator for ARMv7-A since no other
symbol exists for this and NEON is only available in this
variant.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Janne Grunau [Thu, 10 Nov 2011 16:30:33 +0000 (17:30 +0100)]
pthread: do not touch has_b_frames
Adding the thread count in frame level multithreading to has_b_frames
as an additional delay causes more problems than it solves.
For example inconsistent behaviour during timestamp calculation in
libavformat.
Thread count and frame level multithreading are both set by the user.
If the additional delay caused by frame level multithreading needs
to be considered in the calling code it has all information to take
it into account.
Should it become necessary to calculate a maximum delay inside
libavcodec it should be exported as its own field and not reusing
an existing field.
Based on a patch by Michael Niedermayer.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Tue, 22 Nov 2011 01:54:50 +0000 (02:54 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pthread: add some malloc failure checks
avconv: cosmetics, reformat transcode_init()
avconv: rename 'os' variable to 'oc'
doc/filters: fix some typos.
configure: add libpulse to help output
Conflicts:
avconv.c
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mike Melanson [Mon, 21 Nov 2011 05:48:45 +0000 (21:48 -0800)]
Document a critical gotcha in FATE
FATE samples paths can not be contain a '~' character. This has bitten me
on multiple occasions and I have heard I'm not the only victim.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Nov 2011 22:32:39 +0000 (23:32 +0100)]
ffmpeg: Fix segfault when using ffmpeg with ffserver where ffmpeg does not supply all requested streams.
Fixes Ticket675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ami_stuff [Mon, 21 Nov 2011 19:31:47 +0000 (20:31 +0100)]
[PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder
Some sample IFF ACBM files can be found here:
http://aminet.net/package/dev/basic/ABdemos
Thanks to Peter Ross for his help with this patch.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Nov 2011 21:43:17 +0000 (22:43 +0100)]
Merge remote-tracking branch 'mjbshaw/master'
* mjbshaw/master:
Applied patches from Michael Niedermayer to clean up the code
Added support for J2K encoding with libopenjpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 21 Nov 2011 14:37:40 +0000 (15:37 +0100)]
avconv: cleanup the transcoding loop in output_packet().
Michael Niedermayer [Sun, 20 Nov 2011 18:56:49 +0000 (19:56 +0100)]
ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Mashiat Sarker Shakkhar [Mon, 21 Nov 2011 19:03:15 +0000 (01:03 +0600)]
call revert_cdlms()
Mashiat Sarker Shakkhar [Mon, 21 Nov 2011 19:01:30 +0000 (01:01 +0600)]
Fix some loop conditions to prevent overreads
Mashiat Sarker Shakkhar [Mon, 21 Nov 2011 18:54:01 +0000 (00:54 +0600)]
Initialize pred in lms_predict()
Clément Bœsch [Mon, 21 Nov 2011 06:50:03 +0000 (07:50 +0100)]
Fix various if parenthesis misplacements.
Anton Khirnov [Mon, 21 Nov 2011 13:39:22 +0000 (14:39 +0100)]
avconv: split subtitle transcoding out of output_packet().
Anton Khirnov [Mon, 21 Nov 2011 13:39:22 +0000 (14:39 +0100)]
avconv: split video transcoding out of output_packet().
Anton Khirnov [Mon, 21 Nov 2011 13:39:22 +0000 (14:39 +0100)]
avconv: split audio transcoding out of output_packet().
Anton Khirnov [Mon, 21 Nov 2011 13:06:25 +0000 (14:06 +0100)]
avconv: reindent.
Anton Khirnov [Mon, 21 Nov 2011 13:05:38 +0000 (14:05 +0100)]
avconv: move streamcopy-only code out of decoding loop.
Anton Khirnov [Mon, 21 Nov 2011 12:51:51 +0000 (13:51 +0100)]
avconv: remove an always true condition and reindent.
Anton Khirnov [Mon, 21 Nov 2011 12:48:45 +0000 (13:48 +0100)]
avconv: split off streamcopy handling into a separate loop.
This is easier to understand and is less likely to break horribly when a
stream is to be both decoded and copied.
Michael Niedermayer [Fri, 18 Nov 2011 18:10:21 +0000 (19:10 +0100)]
svq1dec: call avcodec_set_dimensions() after dimensions changed.
Fixes NGS00148
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Nov 2011 17:08:31 +0000 (18:08 +0100)]
vp3dec: Check coefficient index in vp3_dequant()
Fixes NGS00145
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Nov 2011 16:48:31 +0000 (17:48 +0100)]
qdm2dec: fix buffer overflow.
Fixes NGS00144
Thanks to Phillip for suggestions to improve the patch.
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 16 Nov 2011 22:30:28 +0000 (17:30 -0500)]
pthread: add some malloc failure checks
Michael Niedermayer [Sat, 19 Nov 2011 19:41:30 +0000 (20:41 +0100)]
alsdec: update checked AV_EF flags.
A user who wishes to use default error concealment cannot set the
AV_EF_CRCCHECK flag because not every CRC in every format is a
reliable indicator of bitstream damage. In some formats crcrs
can be nonsensical in absence of any damage. We thus add the
AV_EF_CAREFUL flag in addition to the AV_EF_CRCCHECK flag to
allow a user to enable this reliable CRC check without having to
enable all CRC checks in all formats.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 20 Nov 2011 11:32:27 +0000 (12:32 +0100)]
avconv: cosmetics, reformat transcode_init()
Fix spacing, vertically align, break some long lines, add some empty
lines for readability.
Anton Khirnov [Sun, 20 Nov 2011 11:23:55 +0000 (12:23 +0100)]
avconv: rename 'os' variable to 'oc'
Output AVFormatContext is called 'oc' in most other places.
Anton Khirnov [Sun, 20 Nov 2011 05:42:43 +0000 (06:42 +0100)]
doc/filters: fix some typos.
Anton Khirnov [Fri, 18 Nov 2011 10:08:31 +0000 (11:08 +0100)]
configure: add libpulse to help output
Fixes Bug 72.
Michael Niedermayer [Mon, 21 Nov 2011 03:16:41 +0000 (04:16 +0100)]
vsrc_mandelbrot: fix inner=period, the previous optimizations broke it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Nov 2011 01:03:13 +0000 (02:03 +0100)]
h264: Fix invalid interlaced progressive MB combinations for direct mode prediction.
Fixes Ticket312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Sun, 20 Nov 2011 21:51:12 +0000 (12:51 -0900)]
MAINTAINERS: add myself as a web site maintainer
Also add GPG fingerprint.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Nov 2011 23:06:23 +0000 (00:06 +0100)]
ffmpeg: 10l add back show_banner() that was lost in the last merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Nov 2011 21:31:36 +0000 (22:31 +0100)]
git-howto: update git url.
git.videolan.org is confusing to some users as videolan is a seperate project from ffmpeg.
the new name points to git.videolan.org but avoids the confusion.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Nov 2011 19:40:22 +0000 (20:40 +0100)]
h263: make default color black, like flv
Fixes Ticket126
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Nov 2011 16:19:25 +0000 (17:19 +0100)]
mpegvideo: dont use ff_mspel_motion() for vc1
Fixes Ticket655
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 20 Nov 2011 14:25:01 +0000 (15:25 +0100)]
swr: change minimum I/O channel count to zero.
This will silence the warning of av_set_opt_int() in swr for
input/output channels when the layout is not yet defined (or supported).
Michael Niedermayer [Sun, 20 Nov 2011 14:43:19 +0000 (15:43 +0100)]
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall: (24 commits)
Clean-up
dump_int_buffer() to dump samples from a buffer
Implement revert_cdlms()
Doxy for reset_codec()
Store transient state and position of transient area
Implement use_high_update_speed() and use_normal_update_speed()
Initialize num_logged_tiles and remove unnecessary codes
Log index for each line of output
Log tile size
Output decoded residues
Replace placeholders with actual calls to clear_codec_buffers() and reset_codec()
Implement lms_update()
Implement lms_predict()
Implement reset_codec()
Add missing syntax elements to WmallDecodeCtx
Add .recent syntax element to cdlms struct
Implement clear_codec_buffers()
Add buffers to context necessary for reverting cdmls and mclms filter
Use avpriv_copy_bits() instead of ff_copy_bits()
Cosmetics
...
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Nov 2011 13:44:41 +0000 (14:44 +0100)]
avopts: Fix random values being printed in error messages:
Bug introduced in:
commit
7bb1807c2dd9623842f1c6d454e7f2892b5bc8d7
Author: Anton Khirnov <anton@khirnov.net>
Date: Tue Aug 23 12:58:49 2011 +0200
AVOptions: refactor set_number/write_number
write_number() does the actual writing of the supplied
number to destination. Move finding the option and choosing destination
address out of it.
Reimar Döffinger [Sun, 20 Nov 2011 14:02:26 +0000 (15:02 +0100)]
Fix compilation with YASM.
YASM does not support %ifempty even though it is in the official
NASM documentation and supported since NASM 2.02.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 8 Nov 2011 19:10:44 +0000 (20:10 +0100)]
HACK: fix compilation with NASM.
This issue is actually already fixed in NASM, however it will be a
bit before it arrives everywhere.
This should work as a temporary work-around.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 11:12:28 +0000 (17:12 +0600)]
Clean-up
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 13:14:51 +0000 (19:14 +0600)]
dump_int_buffer() to dump samples from a buffer
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 10:07:12 +0000 (16:07 +0600)]
Implement revert_cdlms()
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 10:04:35 +0000 (16:04 +0600)]
Doxy for reset_codec()
Mashiat Sarker Shakkhar [Sat, 12 Nov 2011 10:03:54 +0000 (16:03 +0600)]
Store transient state and position of transient area
Mashiat Sarker Shakkhar [Thu, 10 Nov 2011 07:42:10 +0000 (13:42 +0600)]
Implement use_high_update_speed() and use_normal_update_speed()