OSDN Git Service
Baptiste Coudurier [Tue, 19 Apr 2011 23:12:13 +0000 (16:12 -0700)]
In libx264 wrapper, add -level specific option.
Baptiste Coudurier [Tue, 19 Apr 2011 22:23:36 +0000 (15:23 -0700)]
Fix libx264 fastfirstpass, move apply_fastfirstpass after user customized options.
Nicolas George [Tue, 19 Apr 2011 21:36:29 +0000 (23:36 +0200)]
oggparsecelt: cosmetic: order lines more logically.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Nicolas George [Tue, 19 Apr 2011 21:03:51 +0000 (23:03 +0200)]
oggparsecelt: call av_set_pts_info unconditionally.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Baptiste Coudurier [Sun, 30 Jan 2011 01:05:42 +0000 (17:05 -0800)]
In libx264 wrapper, do not set pic quality if no frame is output, avoids
uninitialized reads.
Baptiste Coudurier [Tue, 19 Apr 2011 19:57:46 +0000 (12:57 -0700)]
Prefer codec specific options over global ones, allowing codec
to override global options.
Nicolas George [Fri, 15 Apr 2011 17:18:04 +0000 (19:18 +0200)]
Ogg: add support for Xiph's CELT (Opus) codec.
This patch also introduces CODEC_ID_CELT.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Stefano Sabatini [Sun, 17 Apr 2011 15:19:05 +0000 (17:19 +0200)]
pad: make the filter parametric
Address trac issue #61.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Peter Belkner [Tue, 19 Apr 2011 10:00:01 +0000 (12:00 +0200)]
32bit libmp3lame support.
Peter Belkner [Tue, 19 Apr 2011 09:58:53 +0000 (11:58 +0200)]
Check avcodec_alloc_frame() failure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 16 Apr 2011 21:18:22 +0000 (23:18 +0200)]
ffmpeg: reformat resample condition code in transcode()
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sat, 16 Apr 2011 21:11:01 +0000 (23:11 +0200)]
ffmpeg: factorize resampling condition check in do_video_out()
Simplify and improve readability.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sat, 16 Apr 2011 23:38:09 +0000 (01:38 +0200)]
ffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippet
Simplify, ease readability.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sat, 16 Apr 2011 20:58:13 +0000 (22:58 +0200)]
ffmpeg: improve reporting if size/pixel format changes
Use av_log() rather than fprintf(stderr, ...), and show information
related to the previous size/pixel format configuration.
Consistent with the corresponding message issued in case of audio
configuration change.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sat, 16 Apr 2011 21:14:44 +0000 (23:14 +0200)]
ffmpeg: remove unused fields AVOutputStream.original_width/height
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sat, 16 Apr 2011 20:51:04 +0000 (22:51 +0200)]
ffmpeg: remove unused variable padding_src in do_video_out()
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Carl Eugen Hoyos [Tue, 19 Apr 2011 09:50:27 +0000 (11:50 +0200)]
Be more verbose when printing the probe result.
Gavin Kinsey [Tue, 19 Apr 2011 08:16:07 +0000 (10:16 +0200)]
Fix compilation.for iOS ARMv7.
Carl Eugen Hoyos [Tue, 19 Apr 2011 01:23:46 +0000 (03:23 +0200)]
Only ask once in the code for a TrueHD sample with strange channel layout.
Carl Eugen Hoyos [Tue, 19 Apr 2011 01:18:08 +0000 (03:18 +0200)]
Also set the MLP/TrueHD channel layout in the decoder.
Applications might not use the parser,
Carl Eugen Hoyos [Tue, 19 Apr 2011 01:09:11 +0000 (03:09 +0200)]
Make MLP/TrueHD channel layout functions visible to the decoder.
Michael Niedermayer [Tue, 19 Apr 2011 00:06:57 +0000 (02:06 +0200)]
Merge commit '
f0a41afd8a37ebe972436fabfa3d289178bbd83b'
* commit '
f0a41afd8a37ebe972436fabfa3d289178bbd83b':
Not pulled: Replace mplayerhq.hu URLs by libav.org.
asfdec: Remove dead code from asf_read_close().
ptx: Use av_log_ask_for_sample() where appropriate.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Apr 2011 11:10:52 +0000 (13:10 +0200)]
ffmpeg:Daemon mode, add -d as first option to try it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Apr 2011 11:04:33 +0000 (13:04 +0200)]
ffmpeg:Fix negative verbositiy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Apr 2011 23:07:55 +0000 (01:07 +0200)]
Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.
Baptiste Coudurier [Sat, 29 Jan 2011 05:32:09 +0000 (21:32 -0800)]
In mov and flv muxer, check aac bitstream validity.
royger [Mon, 18 Apr 2011 15:50:16 +0000 (17:50 +0200)]
Added key_frame and pict_type to vsrc_movie
Signed-off-by: Roger Pau Monné <roger.pau@entel.upc.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bill Pringlemeir [Fri, 15 Apr 2011 17:15:23 +0000 (13:15 -0400)]
Allow h264pred_init_arm.c to compile.
SOB: Bill Pringlemeir <bpringlemeir@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Fri, 15 Apr 2011 14:59:19 +0000 (00:59 +1000)]
anm decoder: move buffer allocation from decode_init() to decode_frame()
This permits playback in ffplay when libavfilter is enabled.
Resolves ticket #60
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 18 Apr 2011 17:21:25 +0000 (19:21 +0200)]
vsrc_movie: fix leak in request_frame()
Also set movie->picref to NULL, in order to avoid a crash in uninit()
when movie->picref is unreffed again and it was already freed.
Fix trac issue #66.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Diego Biurrun [Sun, 17 Apr 2011 18:13:59 +0000 (20:13 +0200)]
Replace mplayerhq.hu URLs by libav.org.
Diego Biurrun [Sun, 17 Apr 2011 17:48:27 +0000 (19:48 +0200)]
asfdec: Remove dead code from asf_read_close().
Diego Biurrun [Sun, 17 Apr 2011 21:42:10 +0000 (23:42 +0200)]
ptx: Use av_log_ask_for_sample() where appropriate.
Alexander Strange [Sun, 17 Apr 2011 22:47:35 +0000 (00:47 +0200)]
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Release unused pictures even when not calling ff_h264_frame_start()
h264: Fix decoding race condition with PAFF
h264: cosmetic whitespace change
Duplicate Fix REBASE_PICTURE with h.264
Not pulled Update test scripts to use ffmpeg instead of ffmpeg_g
Duplicate Fix ffmpeg-mt fixme in h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Apr 2011 21:57:50 +0000 (23:57 +0200)]
10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Apr 2011 21:36:57 +0000 (23:36 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
make av_dup_packet() more cautious on allocation failures
make containers pass palette change in AVPacket
introduce side information for AVPacket
Politic commits that have not been pulled:
Update regtest checksums after revision
6001dad.
Replace more FFmpeg references by Libav.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 17 Apr 2011 20:18:00 +0000 (22:18 +0200)]
Update regtest checksums after revision
6001dad.
The string "FFmpeg" was replaced by "Libav" in metadata that
got encoded in file headers.
Diego Biurrun [Fri, 15 Apr 2011 20:30:26 +0000 (22:30 +0200)]
Replace more FFmpeg references by Libav.
Justin Ruggles [Sun, 17 Apr 2011 16:26:47 +0000 (12:26 -0400)]
ac3dec: fix processing of delta bit allocation information.
The number of dba segments is the coded value + 1.
The coupling dba offset starts at the first coupling band, not at zero.
Stefano Sabatini [Sun, 17 Apr 2011 15:23:48 +0000 (17:23 +0200)]
scale: set evaluated value for the "out_w" and "out_h" constants
The constant values were never set, thus the evaluation of expressions
referencing those constants were resulting in an error.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sun, 17 Apr 2011 14:26:53 +0000 (16:26 +0200)]
scale: fix computation for the "hsub" and "vsub" constants
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Ronald S. Bultje [Sat, 16 Apr 2011 19:29:05 +0000 (19:29 +0000)]
vc1: fix fate-vc1 after previous commit.
PROFILE_ADVANCED doesn't set res_fasttx, so make that a special case
in the condition that decides which IDCT to use (and whether to read
coefficients transposed or not).
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Baptiste Coudurier [Sat, 16 Apr 2011 23:59:39 +0000 (16:59 -0700)]
Remove now useless ffpresets for x264, use -preset
Baptiste Coudurier [Sat, 16 Apr 2011 23:50:50 +0000 (16:50 -0700)]
In libx264 wrapper, add -preset and -tune options
Baptiste Coudurier [Sat, 16 Apr 2011 23:47:24 +0000 (16:47 -0700)]
ffmpeg: fix -aspect cli option
Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.
If the output display aspect ratio is specified with -aspect, it is
set at the end of the filterchain, thus overriding the value set by
filters in the filterchain.
This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors).
Baptiste Coudurier [Sat, 16 Apr 2011 23:19:10 +0000 (16:19 -0700)]
In mov muxer, compute avg bitrate in esds
Michael Niedermayer [Sat, 16 Apr 2011 21:20:48 +0000 (23:20 +0200)]
Correctly implement ac3 float/fixed encoder.
There is no need to have 2 encoders, the input sample format can,does and should choose which is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 11 Apr 2011 11:16:07 +0000 (13:16 +0200)]
ffmpeg: use parse_number_and_die() when it makes sense
Prefer parse_number_or_die() over atoi()/atol() parsing for the options:
-pass, -top, -vc, and -qscale.
Improve input validation.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sat, 16 Apr 2011 11:41:53 +0000 (13:41 +0200)]
cmdutils: add OPT_INT check in parse_number_or_die()
Check that the value passed for an OPT_INT option is an int, fail
otherwise.
Ronald S. Bultje [Sat, 16 Apr 2011 19:07:14 +0000 (15:07 -0400)]
wmv3dec: fix playback of complex WMV3 files using simple_idct.
IDCT coefficients are read transposed, but simple_idct does not expect
this. Therefore, only do tranposed coefficient reading if we're not
using simple_idct.
Fixes http://forum.videolan.org/viewtopic.php?f=14&t=89651
Reimar Döffinger [Thu, 7 Apr 2011 20:41:47 +0000 (22:41 +0200)]
Use av_set_pts_info to set time_base.
Also remove useless assignments of 0, the priv
context is initialized to 0.
Reimar Döffinger [Thu, 7 Apr 2011 20:35:43 +0000 (22:35 +0200)]
Enable header parsing for MPEG2VIDEO to get time-stamps.
FFmpeg can generate pts and dts on its own, but only
if we enable parsing, so do that.
This fixes ticket #46.
Philip Langdale [Thu, 14 Apr 2011 05:00:18 +0000 (22:00 -0700)]
CrystalHD: Fix usage of h264 parser.
I was using the wrong value to track the position of the parser in the
stream. For an error-free stream, the size of the frame and number of
bytes consumed will be the same, but in an error situation they can
diverge.
Signed-off-by: Philip Langdale <philipl@overt.org>
Roger Pau Monné [Sat, 16 Apr 2011 08:09:15 +0000 (10:09 +0200)]
Add key_frame and pict_type to AVFilterBufferRefVideo.
Michael Niedermayer [Sat, 16 Apr 2011 01:55:42 +0000 (03:55 +0200)]
Merge commit '
4d012eb541ed7f35e00c87035a470d9f0a24a6e8'
* commit '
4d012eb541ed7f35e00c87035a470d9f0a24a6e8':
xwma: Fix wrong printf format expression.
xwma demuxer: typos
oggdec: simplify audio chained ogg streams support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Apr 2011 01:46:27 +0000 (03:46 +0200)]
Merge commit '
f668afd4896ee65683619b6f165dda4cdd46766f'
* commit '
f668afd4896ee65683619b6f165dda4cdd46766f':
swscale: fix "ISO C90 forbids mixed declarations and code" warning
swscale: fix compilation with --enable-runtime-cpudetect
swscale: correct include path to fix ppc altivec build
swscale: simplify rgb2rgb templating
swscale: simplify initialization code
swscale: further cleanup swscale.c
swscale: partially move the arch specific code left
swscale: move away x86 specific code from rgb2rgb
None of above is merged, the changes are not yet ready they add over 2000 lines of duplicated code and a few bugs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 15 Apr 2011 15:49:36 +0000 (17:49 +0200)]
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
Kostya Shishkov [Wed, 13 Apr 2011 15:36:02 +0000 (17:36 +0200)]
make av_dup_packet() more cautious on allocation failures
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Kostya Shishkov [Sat, 9 Apr 2011 13:49:51 +0000 (15:49 +0200)]
make containers pass palette change in AVPacket
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Kostya Shishkov [Sat, 9 Apr 2011 13:31:39 +0000 (15:31 +0200)]
introduce side information for AVPacket
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diego Biurrun [Fri, 15 Apr 2011 11:28:04 +0000 (13:28 +0200)]
xwma: Fix wrong printf format expression.
Also add inttypes.h #include for PRId64 macros.
This fixes the following warnings:
libavformat/xwma.c:147: warning: too many arguments for format
libavformat/xwma.c:151: warning: too many arguments for format
Max Horn [Fri, 15 Apr 2011 07:43:15 +0000 (09:43 +0200)]
xwma demuxer: typos
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Carl Eugen Hoyos [Fri, 15 Apr 2011 09:50:28 +0000 (11:50 +0200)]
Allow to print wider unsupported channel layouts.
Carl Eugen Hoyos [Fri, 15 Apr 2011 09:48:03 +0000 (11:48 +0200)]
Warn if Vorbis does not support the provided channel layout.
The warning is printed with loglevel error because the output
stream is known to be broken.
Also warn if no channel layout was provided for multichannel input.
Clément Bœsch [Sun, 10 Apr 2011 07:26:43 +0000 (09:26 +0200)]
oggdec: simplify audio chained ogg streams support
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Janne Grunau [Fri, 15 Apr 2011 07:12:34 +0000 (09:12 +0200)]
swscale: fix "ISO C90 forbids mixed declarations and code" warning
only hit with --enable-runtime-cpudetect
Janne Grunau [Fri, 15 Apr 2011 00:09:44 +0000 (02:09 +0200)]
swscale: fix compilation with --enable-runtime-cpudetect
Michael Niedermayer [Fri, 15 Apr 2011 02:37:17 +0000 (04:37 +0200)]
Merge commit '
a3a0af4fb1237bed0af75868073f9a63db8b1864'
* commit '
a3a0af4fb1237bed0af75868073f9a63db8b1864':
avutil: make aes and sha api public
handle malloc failures in ff_get_wav_header
add xWMA demuxer
mpegts: force the default timebase
libavcodec: Bump micro after adding the dtx AVOptions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Thu, 14 Apr 2011 22:31:04 +0000 (00:31 +0200)]
swscale: correct include path to fix ppc altivec build
Michael Niedermayer [Thu, 14 Apr 2011 20:35:23 +0000 (22:35 +0200)]
Fix BE/LE order of pix formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 14 Apr 2011 20:03:45 +0000 (22:03 +0200)]
swscale: simplify rgb2rgb templating
MMX is always built. Drop the ifdefs
Josh Allmann [Wed, 13 Apr 2011 18:57:32 +0000 (20:57 +0200)]
swscale: simplify initialization code
Simplify the fallthrough case when no accelerated functions
can be initialized.
Josh Allmann [Wed, 13 Apr 2011 18:57:31 +0000 (20:57 +0200)]
swscale: further cleanup swscale.c
Move x86-specific constants out of swscale.c
Luca Barbato [Wed, 13 Apr 2011 18:57:30 +0000 (20:57 +0200)]
swscale: partially move the arch specific code left
PPC and x86 code is split off from swscale_template.c. Lots of code is
still duplicated and should be removed later.
Again uniformize the init system to be more similar to the dsputil one.
Unset h*scale_fast in the x86 init in order to make the output
consistent with the previous status. Thanks to Josh for spotting it.
Luca Barbato [Wed, 13 Apr 2011 18:57:29 +0000 (20:57 +0200)]
swscale: move away x86 specific code from rgb2rgb
Keep only the plain C code in the main rgb2rgb.c and move the x86
specific optimizations to x86/rgb2rgb.c
Change the initialization pattern a little so some of it can be
factorized to behave more like dsputils.
Alexis Ballier [Thu, 7 Apr 2011 13:19:23 +0000 (10:19 -0300)]
avutil: make aes and sha api public
The functions are already av_ prefixed and sha1 header is already provided.
Install libavutil/{aes,sha}.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Max Horn [Tue, 12 Apr 2011 15:44:20 +0000 (17:44 +0200)]
handle malloc failures in ff_get_wav_header
ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.
To address this, change ff_get_wav_header to return an error if
allocation failed, and adapted all calling code to handle that error.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Max Horn [Tue, 12 Apr 2011 11:59:39 +0000 (13:59 +0200)]
add xWMA demuxer
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Rudolf Polzer [Thu, 14 Apr 2011 09:12:57 +0000 (11:12 +0200)]
mpegts: force the default timebase
The mpegts muxer does not set the stream time base using
av_set_pts_info, but expects it to have the default value of 1/90000.
If the calling code changes stream pts before writing the header,
other muxers override the time base at that point (like mpegenc.c).
Martin Storsjö [Wed, 13 Apr 2011 22:04:53 +0000 (01:04 +0300)]
libavcodec: Bump micro after adding the dtx AVOptions
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Thu, 14 Apr 2011 02:16:53 +0000 (04:16 +0200)]
AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output.
Carl Eugen Hoyos [Thu, 14 Apr 2011 01:43:58 +0000 (03:43 +0200)]
Fix channel order for 7.1 TrueHD samples.
Carl Eugen Hoyos [Thu, 14 Apr 2011 01:14:05 +0000 (03:14 +0200)]
Fix channel order for some MLP samples.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:28:14 +0000 (01:28 +0200)]
Cosmetics: Fix indentation and move one line.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:20:11 +0000 (01:20 +0200)]
Support alsa channel reordering for float.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:14:19 +0000 (01:14 +0200)]
Add forgotten line to silence a warning for int32.
AV_CH_LAYOUT_QUAD is the only (multi-) channel layout that has the
same channel ordering for FFmpeg and alsa.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:10:18 +0000 (01:10 +0200)]
Also support alsa channel reordering for u16 and u32 formats.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:07:01 +0000 (01:07 +0200)]
Rename the s16 and s32 alsa reorder functions as int16 and int32.
The functions will also be used for unsigned formats.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:04:18 +0000 (01:04 +0200)]
Support unsigned variants of already supported signed formats in alsa.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:00:26 +0000 (01:00 +0200)]
Support a-law and mu-law output in alsa.
Michael Niedermayer [Thu, 14 Apr 2011 01:21:38 +0000 (03:21 +0200)]
Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
libvo-*: Fix up the long codec names
libavcodec: Mark AVCodec->priv_class const
swscale: Factorize FAST_BGR2YV12 definition.
libvo-aacenc: Only produce extradata if the global header flag is set
lavf: postpone removal of public metadata conversion API
lavc: postpone removal of request_channels
lavc: postpone removal of audioconvert and sample_fmt wrappers
lavf: postpone removal of deprecated avio functions
libopencore-amr: Cosmetics: Rewrap and align
libopencore-amr, libvo-amrbwenc: Rename variables and functions
libopencore-amr: Convert commented out debug logging into av_dlog
libopencore-amr: Remove an unused state variable
libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
libopencore-amr: Remove a useless local variable
libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
libopencore-amr: Don't print carriage returns in log messages
...
Conflicts:
doc/developer.texi
libavcodec/avcodec.h
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 13 Apr 2011 18:47:12 +0000 (21:47 +0300)]
libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
DTX, discontinuous transmission, allows emitting frames with
comfort noise when no voice is detected in the input audio.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 13 Apr 2011 08:03:19 +0000 (11:03 +0300)]
libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
Also rename the incorrectly named enc_bitrate to enc_mode, use the
enc_bitrate variable for storing the last chosen bitrate.
This avoids continuous warning log messages if not using an
exactly matching bitrate, while still allowing changing bitrate
at any point.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 13 Apr 2011 07:59:08 +0000 (10:59 +0300)]
libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
Dynamically print the supported bitrates from the local table,
instead of using a hardcoded log message.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 13 Apr 2011 19:31:20 +0000 (22:31 +0300)]
libvo-*: Fix up the long codec names
Include VisualOn to clarify the codec name, but remove the
actual library name from the user-friendly description.
Also mention Android, to clarify which VisualOn implementation
this refers to, since they do sell other variants of the same
code, too.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 13 Apr 2011 18:48:00 +0000 (21:48 +0300)]
libavcodec: Mark AVCodec->priv_class const
This avoids warnings of this kind, everywhere priv_class
is initialized:
warning: initialization discards qualifiers from pointer target type
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 11 Apr 2011 17:48:13 +0000 (19:48 +0200)]
swscale: Factorize FAST_BGR2YV12 definition.
It is used only for x86 so it will eventually be moved with that code
into the x86 arch subdirectory.
Carl Eugen Hoyos [Tue, 12 Apr 2011 06:51:58 +0000 (08:51 +0200)]
Mention VisualOn in the new codecs' long names to explain "libvo".
Martin Storsjö [Tue, 12 Apr 2011 07:35:23 +0000 (10:35 +0300)]
libvo-aacenc: Only produce extradata if the global header flag is set
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Wed, 23 Feb 2011 06:38:52 +0000 (07:38 +0100)]
lavf: postpone removal of public metadata conversion API
It's been deprecated only a few months ago, long after 0.6.