FFmpeg/libavformat
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
..
4xm.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
a64.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
aacdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
ac3dec.c ac3dec: fix uninitialized var warning 2012-08-30 05:17:24 +02:00
act.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
adtsenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
adxdec.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
aea.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
aiff.h Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
aiffdec.c Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
aiffenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
allformats.c WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
amr.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
anm.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
apc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
ape.c lavf/ape: Fix stream duration calculation 2012-08-23 15:51:51 +02:00
apetag.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
apetag.h Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
apetagenc.c lavf/apetag: move common stuff between writer and reader to single file 2012-07-29 02:31:27 +00:00
asf.c Do not map asf metadata key WM/Track to track. 2011-12-31 22:33:58 +01:00
asf.h asfdec: parse payload extension list 2012-12-10 23:57:14 +01:00
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
asfcrypt.h
asfdec.c asfdec: check stream_index for validity 2012-12-10 23:57:14 +01:00
asfenc.c asfenc: avoid negative timestamps 2012-09-28 02:47:37 +02:00
assdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
assenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
au.c lavf/au: check bits per coded sample. 2012-08-18 17:45:58 +02:00
audiointerleave.c audiointerleave: check timebase 2012-04-01 21:21:13 +02:00
audiointerleave.h
avc.c Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avc.h Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avformat.h lavf: move fields that appear to be intended as public API to the correct section 2012-09-27 18:19:01 +02:00
avi.h Merge remote-tracking branch 'qatar/master' 2011-11-28 01:07:11 +01:00
avidec.c avidec: try to support oddly muxed MMES stream 2012-12-10 01:06:57 +01:00
avienc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
avio.c lavf/avio: check for : in filenames for protocols. 2013-03-01 08:56:06 +01:00
avio.h avio: flush the internal buffer in avio_close() 2012-09-15 18:24:49 +02:00
avio_internal.h lavf: split out ffio_limit() 2011-12-19 11:57:34 +01:00
aviobuf.c avio: flush the internal buffer in avio_close() 2012-09-15 18:24:49 +02:00
avisynth.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
avlanguage.c
avlanguage.h
avs.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
bethsoftvid.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
bfi.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
bink.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
bintext.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
bit.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
bluray.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
bmv.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
c93.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
cache.c cache: Only include unistd.h if it exists 2012-09-07 19:29:58 +02:00
caf.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
caf.h
cafdec.c Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
cafenc.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
cavsvideodec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
cdg.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
cdxl.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
concat.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
crcenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
crypto.c crypto: Remove a stray double space 2012-08-31 23:27:27 +02:00
cutils.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
daud.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
dfa.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
diracdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
dnxhddec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
dsicin.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
dtsdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
dv.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
dv.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dvenc.c dvenc: dont fail hard if the timecode is invalid 2013-02-06 00:17:23 +01:00
dxa.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
eacdata.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
electronicarts.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
ffmenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
ffmeta.h
ffmetadec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
ffmetaenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
file.c file: set the return value type for lseek to off_t 2012-09-27 01:47:49 +02:00
filmstripdec.c filmstripdec: add new line to error message 2012-08-31 23:03:18 +02:00
filmstripenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
flacdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
flacenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
flacenc.h
flacenc_header.c Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
flic.c flic: use AV_LOG_ERROR for error message 2012-08-31 23:04:05 +02:00
flv.h Merge remote-tracking branch 'qatar/master' 2012-06-28 23:57:31 +02:00
flvdec.c Do not change codec in flv streams if the user has forced a codec. 2013-02-01 23:42:12 +01:00
flvenc.c flvenc: silence bogus warning 2012-09-18 10:31:04 +02:00
framecrcenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
framehash.c frame{crc/md5}: set the stream timebase from codec timebase. 2012-02-03 09:29:02 +01:00
g723_1.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
g729dec.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
gif.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
gopher.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
gsmdec.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
gxf.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
gxf.h
gxfenc.c gxfenc: assert that the to be written data has not been truncated. 2012-09-09 14:31:44 +02:00
h261dec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
h263dec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
h264dec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
hls.c hls: fix timebase 2013-03-07 15:01:27 +01:00
hlsproto.c cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
http.c Document why we always send a Range HTTP header. 2012-09-23 15:40:17 +02:00
http.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
httpauth.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
icodec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
icoenc.c Add ICO muxer 2012-08-14 16:54:25 +02:00
id3v1.c
id3v1.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
id3v2.c id3v2: strdup the genre name explicitly. 2012-09-17 15:48:20 +02:00
id3v2.h Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
id3v2enc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
idcin.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
idroqdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
idroqenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
iff.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
ilbc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
img2.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
img2dec.c img2dec: always close AVIOContexts 2012-09-12 14:31:09 +02:00
img2enc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
ingenientdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
internal.h lavf: factor ff_free_stream() out 2012-08-21 06:13:54 +02:00
ipmovie.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
isom.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
isom.h Merge remote-tracking branch 'qatar/master' 2012-09-20 21:46:35 +02:00
iss.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
iv8.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2012-06-21 22:37:43 +02:00
ivfenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
jacosubdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
jacosubenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
jvdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
latmenc.c latmenc: Check for LOAS sync word 2013-02-25 05:48:14 -03:00
libavformat.v libavformat.v: export ffurl_protocol_next 2012-09-13 16:21:25 +02:00
libmodplug.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
libnut.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2012-06-04 00:33:42 +02:00
lmlm4.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
loasdec.c Require at least three frames to autodetect loas. 2013-03-02 02:05:02 +01:00
lxfdec.c Support reading 16-channel lxf files. 2012-08-16 10:20:25 +02:00
m4vdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
matroska.c matroskaenc: add codec_tag lists back. 2013-01-24 02:34:16 +01:00
matroska.h lavf/mkv: prefix video stereo arrays with ff_. 2012-09-16 02:58:40 +02:00
matroskadec.c Merge remote-tracking branch 'qatar/master' 2012-09-21 14:44:32 +02:00
matroskaenc.c matroskaenc: add codec_tag lists back. 2013-01-24 02:34:16 +01:00
md5enc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
md5proto.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
metadata.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
metadata.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mgsts.c Enable generic index/seeking for mgsts demuxer. 2012-03-26 20:03:57 +02:00
microdvddec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
microdvdenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mkvtimestamp_v2.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mm.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mmf.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mms.c
mms.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
mmsh.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mmst.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
mov.c lavf/mov: skip version and flags attributes in mov_read_chan function 2013-02-06 23:29:30 +01:00
mov_chan.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
mov_chan.h mov_chan: Pass a separate AVIOContext for reading 2012-09-07 10:49:35 +03:00
movenc.c movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd 2013-02-25 04:49:46 +01:00
movenc.h lavf/movenc: add faststart option. 2012-09-27 08:59:36 +02:00
movenchint.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
mp3dec.c mp3dec: Fix VBR bit rate parsing 2013-03-20 15:00:50 +01:00
mp3enc.c mp3enc: merge mp2/mp3_write_trailer 2012-09-16 14:37:50 +02:00
mpc.c mpc: fix seeking to the end 2012-08-27 05:23:42 +02:00
mpc8.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mpeg.c Only skip MLP header in mpeg files if the codec actually is MLP. 2013-01-17 17:43:01 +01:00
mpeg.h
mpegenc.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
mpegts.c Merge commit '07584eaf4a' 2012-09-13 15:22:16 +02:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
mpegtsenc.c mpegtsenc: add forgotten () 2012-09-10 20:57:23 +02:00
mpegvideodec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mpjpeg.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
msnwc_tcp.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
mtv.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mvi.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
mxf.c mxf: export ff_mxf_get_samples_per_frame to lavf 2012-09-21 16:20:38 +02:00
mxf.h mxf: export ff_mxf_get_samples_per_frame to lavf 2012-09-21 16:20:38 +02:00
mxfdec.c mxfdec: allow container_ul to override codec_ul if codec is A-law 2012-09-27 21:28:35 +02:00
mxfenc.c mxf: export ff_mxf_get_samples_per_frame to lavf 2012-09-21 16:20:38 +02:00
mxg.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
ncdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
network.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
network.h Merge remote-tracking branch 'qatar/master' 2012-07-16 20:45:41 +02:00
nsvdec.c nsvdec: change 2 commented assert() to av_assert() 2012-09-18 05:08:32 +02:00
nullenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
nut.c nutenc: keep track of the written syncpoint count 2012-08-26 22:15:16 +02:00
nut.h nutenc: keep track of max_pts 2012-08-26 22:15:20 +02:00
nutdec.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
nutenc.c nutenc: avoid negative timestamps 2012-09-26 15:56:06 +02:00
nuv.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
oggdec.c Merge commit 'd1f05dd183' 2012-09-25 16:00:09 +02:00
oggdec.h oggdec: add missing () for OGG_NOGRANULE_VALUE 2012-09-25 16:03:55 +02:00
oggenc.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
oggparsecelt.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
oggparsedirac.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
oggparseflac.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
oggparseogm.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
oggparseopus.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
oggparseskeleton.c Merge commit 'd1f05dd183' 2012-09-25 16:00:09 +02:00
oggparsespeex.c ogg: check that the expected number of headers had been parsed 2012-09-24 22:35:29 +02:00
oggparsetheora.c oggparsetheora: print error when failing on unknown header 2012-09-25 17:32:11 +02:00
oggparsevorbis.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
oma.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
oma.h omadec: make sample rate table large enough to prevent out of array reading. 2012-04-16 18:36:39 +02:00
omadec.c omadec: switch to AVSTREAM_PARSE_FULL_RAW 2012-07-26 03:30:35 +02:00
omaenc.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
options.c options: Fix warning about incompatible pointer type 2012-07-30 03:48:46 +02:00
options_table.h lavf: Add support offset timestamps on muxing. 2012-09-26 15:55:16 +02:00
os_support.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
os_support.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
paf.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
pcm.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcm.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcmdec.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
pcmenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
pmpdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
psxstr.c psxstr: more correct array type. 2012-09-01 23:45:32 +02:00
pva.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
qcp.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
qtpalette.h
r3d.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rawdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
rawenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rawenc.h
rawvideodec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rdt.c rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 2012-08-21 06:14:29 +02:00
rdt.h
realtextdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
riff.c riff: retry reading metadata without padding if it fails with 2012-12-10 00:36:41 +01:00
riff.h rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
rl2.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rm.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rm.h rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 2012-08-21 06:14:29 +02:00
rmdec.c rmdec: remove unused variable 2012-09-03 22:40:41 +02:00
rmenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
rpl.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rso.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rso.h Merge remote-tracking branch 'qatar/master' 2011-11-03 02:16:26 +01:00
rsodec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rsoenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
rtmp.h Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
rtmpcrypt.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
rtmpcrypt.h Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rtmpdh.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtmpdh.h Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rtmphttp.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
rtmppkt.c rtmp: fix buffer overflows in ff_amf_tag_contents() 2013-02-07 01:00:01 +01:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2012-08-02 23:34:01 +02:00
rtmpproto.c rtmpproto: increase APP_MAX_LENGTH 2013-03-04 00:30:06 +01:00
rtp.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtp.h Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtpdec_amr.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_asf.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec_g726.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_h263.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_h263_rfc2190.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
rtpdec_h264.c Merge commit 'd488c3bcba' 2012-08-29 18:04:34 +02:00
rtpdec_ilbc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_jpeg.c Merge commit '07584eaf4a' 2012-09-13 15:22:16 +02:00
rtpdec_latm.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_mpeg4.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_qcelp.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_qdm2.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_qt.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_svq3.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_vp8.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
rtpdec_xiph.c rtpdec_xiph: switch to av_assert() 2012-08-24 13:44:25 +02:00
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
rtpenc_aac.c
rtpenc_amr.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_chain.h Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_h263.c Change all uses of restrict to use av_restrict instead. 2012-06-17 00:38:39 +02:00
rtpenc_h263_rfc2190.c rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 2012-03-01 16:08:32 +02:00
rtpenc_h264.c rtpenc: fix overflow checking in avc_mp4_find_startcode() 2013-02-07 01:00:01 +01:00
rtpenc_jpeg.c Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
rtpenc_latm.c
rtpenc_mpv.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rtpenc_vp8.c
rtpenc_xiph.c rtpenc_xiph: switch to av_assert 2012-08-28 22:29:20 +02:00
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtsp.c rtsp: fix "warning: ret may be used uninitialized in this function" 2012-09-22 04:49:04 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
rtspcodes.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
rtspenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
samidec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
sapenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
sauce.c
sauce.h
sbgdec.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
sctp.c sctp: add port missing error message 2012-07-25 20:31:16 +03:00
sdp.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
seek-test.c seek-test: support printing multiple packets 2012-05-04 14:40:22 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
seek.h Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
segafilm.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
segment.c lavf/segment: Use distinct IDs for list type ext & csv 2012-09-15 22:58:12 +02:00
sierravmd.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
siff.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
smacker.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
smjpeg.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
smjpeg.h Replace Libav with FFmpeg in license headers for files created by me 2012-06-29 01:58:34 +00:00
smjpegdec.c Replace Libav with FFmpeg in license headers for files created by me 2012-06-29 01:58:34 +00:00
smjpegenc.c Merge commit '3f7fd59d15' 2012-09-16 14:24:11 +02:00
smoothstreamingenc.c Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
smush.c smush: read subversion for version==1 too. 2012-09-09 02:36:57 +02:00
sol.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
sox.h
soxdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
soxenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
spdif.c
spdif.h
spdifdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
spdifenc.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
srtdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
srtenc.c matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 2012-08-31 20:22:49 -07:00
subtitles.c lavf/subtitles: add some SMIL helpers. 2012-06-29 20:20:02 +02:00
subtitles.h lavf/subtitles: add some SMIL helpers. 2012-06-29 20:20:02 +02:00
subviewerdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
swf.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
swf.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
swfdec.c lavf/swfdec: fix flushing with compressed swf. 2012-12-03 16:40:17 +01:00
swfenc.c Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size" 2013-02-17 20:33:07 +01:00
tcp.c Merge remote-tracking branch 'qatar/master' 2012-07-25 22:00:06 +02:00
thp.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
tiertexseq.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
tls.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
tmv.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
tta.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
tty.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
txd.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
udp.c udp: pick params from AVOptions also 2012-09-15 22:13:21 +02:00
url.h Add 'rw_timeout' into URLContext 2012-08-29 00:05:03 +02:00
urldecode.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
urldecode.h Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
utils.c avformat: Fix apics with aac 2013-03-07 15:01:31 +01:00
vc1test.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
vc1testenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
version.h lavf: move fields that appear to be intended as public API to the correct section 2012-09-27 18:19:01 +02:00
voc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
voc.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
vocdec.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
vocenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
vorbiscomment.c
vorbiscomment.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
vqf.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
wav.c riff: ignore ff_read_riff_info() failure. 2012-12-10 00:36:58 +01:00
wc3movie.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
webvttdec.c WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
westwood_aud.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
westwood_vqa.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
wtv.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
wtv.h
wtvdec.c wtvdec: demux thumbnail picture to AVStream.attached_pic 2013-01-30 09:53:49 +01:00
wtvenc.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
wv.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
wvenc.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
xa.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
xmv.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
xwma.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
yop.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
yuv4mpeg.c yuv4mpeg: fix potential alignment bug 2012-09-08 13:37:35 +02:00