No description
Find a file
Alexander Kojevnikov 7fc39f51cd mp3dec: Fix VBR bit rate parsing
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 29d8cd265a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 15:00:50 +01:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc doc/APIchanges: List merge commit hashes and version numbers 2013-02-25 05:19:34 +01:00
libavcodec mp3dec: Fix VBR bit rate parsing 2013-03-20 15:00:50 +01:00
libavdevice lavd/lavfi: push frames until the last sink is EOF 2012-09-20 12:13:17 +02:00
libavfilter avf_showwaves: fix null pointer dereference 2013-01-21 23:15:12 +01:00
libavformat mp3dec: Fix VBR bit rate parsing 2013-03-20 15:00:50 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample swr: check channel layouts before using them. 2013-03-03 03:00:51 +01:00
libswscale sws: dont write out of array on bigendian 2013-02-14 14:39:21 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests mp3dec: Fix VBR bit rate parsing 2013-03-20 15:00:50 +01:00
tools Fix two "skiping" typo. 2012-09-25 07:42:32 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Changelog, split next from 1.0 2012-09-27 20:25:53 +02:00
cmdutils.c cmdutils: sort codec lists. 2012-09-23 21:05:29 +02:00
cmdutils.h Merge commit 'ec36aa6944' 2012-08-31 13:01:30 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure configure: Make warnings from -Wreturn-type fatal errors 2013-02-25 04:49:46 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile update for 1.0.5 2013-03-04 00:01:57 +01:00
ffmpeg.c ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffmpeg.h ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffmpeg_filter.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 10:12:20 +01:00
ffplay.c ffplay: Prevent 0/0 aspect from being passed on to lavfi 2012-12-11 00:49:26 +01:00
ffprobe.c Revert "ffprobe: Add a few common disposition cases" 2012-09-28 02:27:10 +02:00
ffserver.c ffserver: set oformat 2012-12-10 00:26:56 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '581281e242' 2012-09-20 03:20:29 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS MAINTAINERS: add 1.0 2012-09-27 01:48:14 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE update for 1.0.5 2013-03-04 00:01:57 +01:00
VERSION update for 1.0.5 2013-03-04 00:01:57 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.