]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 7 May 2011 02:14:09 +0000 (04:14 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
mov: fix composition timestamps on movie fragments.
wmavoice: Use proper size in memeset().
Michael Niedermayer [Tue, 26 Apr 2011 01:50:56 +0000 (03:50 +0200)]
mp3enc:simplify
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:49:53 +0000 (03:49 +0200)]
mp3enc:better variable name for the frames field file postion.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:45:48 +0000 (03:45 +0200)]
mp3enc: drop nested structs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:31:02 +0000 (03:31 +0200)]
mp3enc:use FFMIN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:24:28 +0000 (03:24 +0200)]
mp3enc:Drop unneeded floating point math.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:22:21 +0000 (03:22 +0200)]
mp3enc: drop sum and count bytes instead of bitrates from decoded headers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:06:51 +0000 (03:06 +0200)]
mp3enc: remove unneeded ifdef
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 01:06:04 +0000 (03:06 +0200)]
mp3enc: remove unneeded static const variables.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Belkner [Sat, 7 May 2011 00:23:28 +0000 (02:23 +0200)]
mp3enc: mux a XING header
The patch below provides exactly that to the MP3 muxer. A XING header
containing
* the numer of frames,
* the size, and
* a TOC
is generated.
It's based on an idea by Anton Khirnov (restricted to the number of
frames) found at
http://patches.ffmpeg.org/patch/1891/
The TOC is generated as found in lame's "VbrTag.c".
According to my tests the following reproduces the number of frames, the
size and the TOC in "c.mp3" from "b.mp3" (except a shift due to shorter
XING header generated by FFmpeg):
lame -V2 a.wav b.mp3
ffmpeg -i b.mp3 -acodec copy -y c.mp3
Michael Niedermayer [Fri, 6 May 2011 23:02:38 +0000 (01:02 +0200)]
avfilter: dont use AVFilterLink as priv for pictures as its freed too early.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 22:01:33 +0000 (00:01 +0200)]
avfilter: Fix ticket82 / fix initial buffer values.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 21:53:06 +0000 (23:53 +0200)]
AVFilter: use picture pool to avoid malloc().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 21:37:43 +0000 (23:37 +0200)]
avfilter_unref_buffer: favor av_freep()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 17:30:14 +0000 (19:30 +0200)]
mpegvideo: fix 422 lowres
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 15:39:31 +0000 (17:39 +0200)]
aiffdec:Rewrite get_meta()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 6 May 2011 15:09:22 +0000 (17:09 +0200)]
Allow encodiing empty subtitles.
Michael Niedermayer [Fri, 6 May 2011 13:19:27 +0000 (15:19 +0200)]
swscale: Dither for unscaled 10->8bit per channel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 11:18:55 +0000 (13:18 +0200)]
swscale: dont reshuffle bytes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yusuke Nakamura [Fri, 29 Apr 2011 14:39:29 +0000 (23:39 +0900)]
mov: fix composition timestamps on movie fragments.
This fixes, for instance, the case that there is a track that has some samples with composition time offset and has a track run without sample-composition-time-offsets-present.
Alex Converse [Thu, 5 May 2011 18:10:19 +0000 (11:10 -0700)]
wmavoice: Use proper size in memeset().
sizeof(array_functrion_argument) gives the size of the pointer type not
the size of the array to which it points.
Michael Niedermayer [Fri, 6 May 2011 02:28:12 +0000 (04:28 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
configure: warn if pkg-config is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 May 2011 01:52:16 +0000 (03:52 +0200)]
avidec: correct frame_offset for seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 6 May 2011 01:27:53 +0000 (03:27 +0200)]
Silence a warning if pkg_config is not installed.
Michael Niedermayer [Fri, 6 May 2011 00:19:25 +0000 (02:19 +0200)]
Makefile:Put lost tab back.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 May 2011 21:54:31 +0000 (23:54 +0200)]
avidec: detect mpeg4 keyframes in indexless avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Baptiste Coudurier [Thu, 5 May 2011 01:45:36 +0000 (18:45 -0700)]
In svq3 decoder, check negative mb_type, fix potential crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Francesco Cosoleto [Tue, 3 May 2011 12:25:43 +0000 (14:25 +0200)]
fate: mention fate documentation in the error message
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 May 2011 19:27:57 +0000 (21:27 +0200)]
MPEG: support 4:4:4 lowres
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 May 2011 19:27:09 +0000 (21:27 +0200)]
MPEG: support 4:4:4 intra lowres
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 5 May 2011 15:45:12 +0000 (16:45 +0100)]
configure: warn if pkg-config is missing
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Tue, 3 May 2011 22:47:53 +0000 (00:47 +0200)]
lavfi-regression: provide filter arguments to showfiltfmts
In do_lavfi_pixfmts(), provide the filter arguments to showfiltfmts,
since some filter may require non-null or non-empty argument string
for working properly.
Stefano Sabatini [Tue, 3 May 2011 21:31:14 +0000 (23:31 +0200)]
eval: add sqrt function for computing the square root
Stefano Sabatini [Wed, 4 May 2011 23:05:07 +0000 (01:05 +0200)]
configure: add strong dependencies for movie source and mp filter
Baptiste Coudurier [Thu, 5 May 2011 13:17:51 +0000 (15:17 +0200)]
SVQ3: do not modify const input buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Baptiste Coudurier [Thu, 5 May 2011 12:40:26 +0000 (14:40 +0200)]
SVQ3: Check that things match up after a frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Baptiste Coudurier [Thu, 5 May 2011 12:18:33 +0000 (14:18 +0200)]
SVQ3: Move svq3 specific fields to their own context.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 May 2011 13:35:54 +0000 (15:35 +0200)]
ffplay: set CODEC_FLAG_EMU_EDGE earlier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 May 2011 01:09:48 +0000 (03:09 +0200)]
Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...
Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 May 2011 00:20:20 +0000 (02:20 +0200)]
rgb24toyv12: break out in the middle before out of array reads.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
alexandru_mg3 [Wed, 4 May 2011 23:42:53 +0000 (01:42 +0200)]
ffplay: fix memleak if avfilter is disabled
Michael Niedermayer [Wed, 4 May 2011 22:52:03 +0000 (00:52 +0200)]
file: Fix mmap error check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 May 2011 21:30:14 +0000 (23:30 +0200)]
configure: jack currently needs sem_timedwait()
Should fix ticket99 and ticket43 by disabling jack.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 May 2011 20:14:22 +0000 (22:14 +0200)]
ffplay: removed unused variable channels.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 May 2011 20:06:41 +0000 (22:06 +0200)]
Disable warnings for casting pointers to integers, there is nothing wrong with that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 May 2011 19:57:08 +0000 (21:57 +0200)]
swscale: fix src type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 May 2011 19:42:08 +0000 (21:42 +0200)]
Fix "libavcodec/dfa.c:189: warning: unused variable ‘frame_end’"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Wed, 4 May 2011 18:44:14 +0000 (20:44 +0200)]
dvbsubdec: Split delete_state()
Michael Niedermayer [Wed, 4 May 2011 17:01:42 +0000 (19:01 +0200)]
xsubenc: only 1 rectangle is supported so dont allow 0 as it would crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Mon, 28 Feb 2011 18:20:41 +0000 (13:20 -0500)]
sonic: fix sonic decoder to match encoder for sample rates other than 44100.
Michael Niedermayer [Wed, 4 May 2011 19:31:07 +0000 (21:31 +0200)]
bitstream_reader: Try to fix "get_bits.h:305:45: warning: variable ‘re_cache’ set but not used [-Wunused-but-set-variable]"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 4 May 2011 18:54:53 +0000 (20:54 +0200)]
doc: Check standalone compilation before submitting new components.
Diego Biurrun [Wed, 4 May 2011 17:20:03 +0000 (19:20 +0200)]
Fix standalone compilation of pipe protocol.
file_check() is not only used by the file protocol, adjust #ifdef accordingly.
Diego Biurrun [Wed, 4 May 2011 17:17:30 +0000 (19:17 +0200)]
Fix standalone compilation of ac3_fixed encoder.
Diego Biurrun [Wed, 4 May 2011 16:48:51 +0000 (18:48 +0200)]
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Diego Biurrun [Wed, 4 May 2011 16:48:26 +0000 (18:48 +0200)]
Fix standalone compilation of IMC decoder.
Diego Biurrun [Wed, 4 May 2011 16:47:07 +0000 (18:47 +0200)]
Fix standalone compilation of WTV demuxer.
Diego Biurrun [Wed, 4 May 2011 12:21:27 +0000 (14:21 +0200)]
Fix standalone compilation of MXPEG decoder.
Diego Biurrun [Tue, 3 May 2011 14:08:53 +0000 (16:08 +0200)]
flashsv: K&R cosmetics
Michael Niedermayer [Wed, 4 May 2011 18:25:33 +0000 (20:25 +0200)]
bitstream reader: remove unneeded variable initilization.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 4 May 2011 16:57:37 +0000 (17:57 +0100)]
matroskaenc: fix memory leak
This fixes a memory leak occurring when no cue points are defined
since commit
91819763 .
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Wed, 4 May 2011 11:40:53 +0000 (07:40 -0400)]
vc1: make overlap filter for I-frames bit-exact.
Ronald S. Bultje [Tue, 3 May 2011 02:09:02 +0000 (22:09 -0400)]
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Ronald S. Bultje [Wed, 4 May 2011 11:35:30 +0000 (07:35 -0400)]
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
This reverts commit
f8bed30d8b176fa030f6737765338bb4a2bcabc9 . The reason
for this is that the overlap filter, which runs after IDCT, should run
on unclamped values, and thus IDCT and put_pixels() cannot be merged if
we want to attempt to be bitexact.
Alex Converse [Tue, 3 May 2011 18:19:31 +0000 (11:19 -0700)]
Replace strncpy() with av_strlcpy().
Alex Converse [Mon, 25 Apr 2011 00:33:37 +0000 (17:33 -0700)]
indeo3: Eliminate use of long.
Alex Converse [Tue, 26 Apr 2011 16:09:05 +0000 (09:09 -0700)]
get_bits: make cache unsigned to eliminate undefined signed overflow.
Uoti Urpala [Sun, 24 Apr 2011 04:21:30 +0000 (07:21 +0300)]
asfdec: fix assert failure on invalid files
Add an extra size validity check in asf_read_frame_header(). Without
this asf->packet_size_left may become negative, which triggers an
assertion failure later.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Wed, 4 May 2011 01:25:40 +0000 (21:25 -0400)]
avfilter: check malloc return values.
Ronald S. Bultje [Tue, 3 May 2011 12:23:41 +0000 (08:23 -0400)]
mpegvideo: reindent.
Ronald S. Bultje [Tue, 3 May 2011 12:19:42 +0000 (08:19 -0400)]
nutenc: check malloc return values.
Ronald S. Bultje [Wed, 27 Apr 2011 15:29:09 +0000 (08:29 -0700)]
avfilter: don't av_malloc(0).
Ronald S. Bultje [Wed, 27 Apr 2011 15:29:02 +0000 (08:29 -0700)]
nutenc: don't av_malloc(0).
Ronald S. Bultje [Wed, 27 Apr 2011 15:28:51 +0000 (08:28 -0700)]
mpegvideo: don't av_malloc(0).
Ronald S. Bultje [Wed, 27 Apr 2011 22:42:16 +0000 (15:42 -0700)]
asfdec: fix parsing of packets that overrun into padding.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Wed, 4 May 2011 02:06:26 +0000 (04:06 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
Implement fate-rsync target
Make ffmpeg support generic data stream
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Feb 2011 23:23:47 +0000 (00:23 +0100)]
msvideo1 regression test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sun, 23 Jan 2011 14:58:23 +0000 (15:58 +0100)]
MS Video 1 encoder
Reinhard Tartler [Sun, 1 May 2011 14:48:40 +0000 (16:48 +0200)]
Implement fate-rsync target
Luca Barbato [Thu, 14 Apr 2011 11:32:36 +0000 (13:32 +0200)]
Make ffmpeg support generic data stream
The patch is the first step to support -dcodec copy
ami_stuff [Thu, 28 Apr 2011 23:20:10 +0000 (01:20 +0200)]
Remove lowres support from wmv2 decoder
lowres option crashes with wmv2 files which I have for test,
so I think it's better to remove the support to the time when
lowres will be really supported by this codec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 May 2011 02:08:23 +0000 (04:08 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
vp8: frame-multithreading.
Duplicate Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Duplicate Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Bug spoted&removed in last merge: dpx: Do not use DPX encoder for decoding.
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 2 May 2011 23:09:30 +0000 (01:09 +0200)]
Support decoding of 24 bit True Audio samples-
Many samples will fail because "Output buffer size is too small."
Carl Eugen Hoyos [Mon, 2 May 2011 23:06:18 +0000 (01:06 +0200)]
Support decoding of 8 bit True Audio samples-
Many samples will fail because "Output buffer size is too small."
Carl Eugen Hoyos [Mon, 2 May 2011 23:02:07 +0000 (01:02 +0200)]
Do not assume AV_SAMPLE_FMT_S16 as tta sample format.
Alexandre Colucci [Mon, 2 May 2011 16:55:02 +0000 (18:55 +0200)]
Fix init_get_bits length argument for init_get_bits.
Do not use rlelen for buffer size in init_get_bits, it is
only the size of the data for the first field.
Since it is not reliable, just use the size of the whole buffer.
Additional comments add removal of unused rlelen variable by
Reimar Döffinger.
ami_stuff [Sun, 1 May 2011 23:45:05 +0000 (01:45 +0200)]
Add *.j2k extension to JPEG2000 decoder
Some files with *.j2k extension can be found for example here:
http://www.openjpeg.org/index.php?menu=samples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 30 Apr 2011 21:00:17 +0000 (23:00 +0200)]
Change guess_palette so its output matches the most common palette.
This means it uses full brightness range and brightness
increasing instead of decreasing with index of non-opaque
color.
Based on patch by Alexandre Colucci [alexandre elgato com]
Reimar Döffinger [Sat, 30 Apr 2011 09:55:36 +0000 (11:55 +0200)]
Make DV (sub) demuxer set proper pkt->pos values.
This makes the avi demuxer create packets with proper pos values
with the file from ticket #140.
Ronald S. Bultje [Mon, 2 May 2011 13:55:52 +0000 (09:55 -0400)]
vp8: frame-multithreading.
Tested on a Mac Pro, 2 CPUs, 2 cores each, OSX 10.6.6:
time ./ffmpeg -v 0 -vsync 0 -threads [1234] -i \
~/Downloads/sintel_trailer_1080p_vp8_vorbis.webm \
-f null -vcodec rawvideo -an -
1: 0m14.630s (89.9 fps)
2: 0m8.056s (163.2 fps)
3: 0m5.882s (223.6 fps)
4: 0m4.952s (265.6 fps)
time ./ffmpeg -v 0 -vsync 0 -threads [1234] -i \
~/Downloads/Elephants_Dream-720p-Stereo.webm \
-f null -vcodec rawvideo -an -
1: 1m12.962s (215.1 fps)
2: 0m44.682s (351.2 fps)
3: 0m31.183s (503.2 fps)
4: 0m25.284s (620.6 fps)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Mon, 2 May 2011 10:35:39 +0000 (12:35 +0200)]
scale: fix leak occurring when a scale filter is reconfigured
This currently only occurrs in vsrc_buffer in case of mid-stream
size/format change.
Fix trac issue #124.
Stefano Sabatini [Sun, 1 May 2011 23:41:28 +0000 (01:41 +0200)]
vsrc_buffer: improve reporting in case of format/size change
Stefano Sabatini [Wed, 27 Apr 2011 23:40:44 +0000 (01:40 +0200)]
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
Stefano Sabatini [Wed, 27 Apr 2011 23:03:28 +0000 (01:03 +0200)]
replace deprecated av_get_pict_type_char() with av_get_picture_type_char()
Stefano Sabatini [Fri, 29 Apr 2011 16:53:57 +0000 (18:53 +0200)]
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Stefano Sabatini [Fri, 29 Apr 2011 14:37:23 +0000 (16:37 +0200)]
Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Kostya Shishkov [Mon, 2 May 2011 08:37:36 +0000 (10:37 +0200)]
dpx: Do not use DPX encoder for decoding.
10l to the one who hasn't checked this.
Michael Niedermayer [Mon, 2 May 2011 01:37:36 +0000 (03:37 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
ALPHA: Replace sized int_fast integer types with plain int/unsigned.
Duplicate DPX image encoder
Duplicate DPX decoder: read sample aspect ratio
Duplciate DPX decoder: add buffer size checks.
ac3enc: clip large coefficient values and negative exponents rather than using av_assert2().
ac3enc: do not store a bandwidth code for each channel.
ac3enc: remove bandwidth reduction as fallback for bit allocation failure.
ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy()
ac3enc: return error if frame+exponent bits are too large instead of using av_assert2().
ac3enc: differentiate between current block and reference block in bit_alloc()
ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes.
ac3enc: simplify stereo rematrixing decision options
Include both URLs: Update URL to fate samples
Conflicts:
Changelog
doc/fate.txt
libavcodec/ac3enc.c
libavcodec/dpxenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 May 2011 20:40:01 +0000 (22:40 +0200)]
AVOptions: av_set_string3() allow NULL strings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 May 2011 15:50:34 +0000 (17:50 +0200)]
dct-test: Support testing bits>8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>