generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,807 Commits 24 Branches 241 Tags 173 MiB
653d7aeb61
Commit Graph

5954 Commits

Author SHA1 Message Date
Martin Storsjö
653d7aeb61 Parse strf mov atoms 
This fixes roundup issue 1270.

Originally committed as revision 22894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 20:36:24 +00:00
David Conrad
adc725b558 oggdec: Move warning about missing granule to the correct place 
Originally committed as revision 22891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 12:21:38 +00:00
David Conrad
44a088eab7 oggdec: Fix duration calculation if the last page in a file has no granule 
Originally committed as revision 22890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 12:21:35 +00:00
David Conrad
49c2d29089 oggdec: Remove write-only variable 
Originally committed as revision 22889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 12:21:29 +00:00
Ramiro Polla
adef229efb AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x) 
FF_NETERROR is implicitly an AVERROR.

Originally committed as revision 22888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 00:20:11 +00:00
Ronald S. Bultje
4aecee7fc3 Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA error). 
This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always
negative, whereas it was previously positive.

Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-15 18:27:27 +00:00
Ronald S. Bultje
e58c05bb3c Remove useless assert(), since this can (in theora) be used for any Xiph 
codec, so there's no reason to (invalidly) limit it to only Theora.

Also fixes issue 1880 (compilation error on -DDEBUG).

Originally committed as revision 22886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-15 13:30:12 +00:00
Howard Chu
19c9eedc2c Plug librtmp logging into av_log. 
patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-13 22:11:21 +00:00
Diego Biurrun
fc122efd66 whitespace cosmetics 
Originally committed as revision 22874 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-13 22:08:36 +00:00
Jean-Daniel Dupas
2898526d6a Do not probe when the format is known. 
Patch by Jean-Daniel Dupas devlists shadowlab org

Originally committed as revision 22870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-13 07:25:50 +00:00
Vitor Sessak
efd8b009ff Use a suitable timebase in VQF demuxer 
Originally committed as revision 22868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-13 01:19:59 +00:00
Howard Chu
c007c687c9 Do not set pos to an error value. 
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-12 15:03:30 +00:00
Tomas Härdin
6b174197b5 Predicting the size of the hdlr, string data and trkn tags in the MOV muxer 
Originally committed as revision 22846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-12 07:24:30 +00:00
Stefano Sabatini
9a2cb05ff9 Move the internal function declarations in avformat.h to internal.h. 
Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-11 21:44:23 +00:00
Howard Chu
7e939205d9 Set audio bit rate. 
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-11 12:21:30 +00:00
Michael Niedermayer
0f1f4816d5 Raise needed score for codec probing in CODEC_ID_PROBE before the last packet. 
Fixes issue1871

Originally committed as revision 22831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-11 00:43:36 +00:00
Michael Niedermayer
497431a5b6 Dont try to compute AVPacket duration for possibly interlaced video codecs 
when no parser is available.
This partly fixes the frame rate misdetection in issue1756.

Originally committed as revision 22824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-09 22:39:39 +00:00
Tomas Härdin
7a6fe01f99 Seeking forward in non-seekable media by discarding data, regardless of how far to seek. Won't SEEK_END unless forced though. 
Originally committed as revision 22822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 09:47:32 +00:00
Tomas Härdin
01d91b9be9 Reusing the probe buffer to rewind the ByteIOContext in ff_probe_input_buffer() instead of seeking back to the start of the file. Once exhausted, the size of the buffer is reduced. 
Originally committed as revision 22821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 09:02:27 +00:00
Joakim Plate
c6cf6ae69d Don't write an empty spdif header in spdif muxers write_header function before actual data starts. 
Patch by Elupus.

Originally committed as revision 22814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-07 19:40:46 +00:00
Ronald S. Bultje
56a8242fdd Actually add flag (somehow got lost in my previous patchset?), fixes broken 
r22806.

Originally committed as revision 22807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 19:50:45 +00:00
Anton Khirnov
3dd6180fc7 Add a flag to not overwrite existing tags 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 19:46:55 +00:00
Martin Storsjö
0950e1703b Reindent 
Originally committed as revision 22805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 17:26:06 +00:00
Martin Storsjö
0e4b185a8d Fix leaks in the AAC RTP depacketizer 
Originally committed as revision 22804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 17:25:39 +00:00
Ronald S. Bultje
1da1e1933f Add void to a function prototype that takes no arguments. Fixes a potential 
compiler warning.

Originally committed as revision 22803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 16:13:51 +00:00
Michael Niedermayer
0e1f78f90b Fix rounding direction for calculation of AVPacket.duration. 
Fixes issue1579

Originally committed as revision 22802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 22:19:42 +00:00
Martin Storsjö
3370289a4c Zero-initialize the reply struct 
The status_code field is read in the fail codepath, where it could be
read uninitialized earlier. Found by clang.

Originally committed as revision 22801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 21:59:06 +00:00
Stefano Sabatini
5b33a55376 Implement support to the AVSEEK_SIZE operation in file_seek(). 
Avoid the need to use seeking for getting the file size, use fstat
instead, which is significantly faster.

See thread:
Subject: [FFmpeg-devel] [PATCH] Add support to AVSEEK_SIZE to the file protocol seek callback
Date: Fri, 2 Apr 2010 13:13:27 +0200

Originally committed as revision 22799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 14:21:29 +00:00
Michael Niedermayer
37f57ab4dd Allow AVFormatContext.duration to be set if no individual stream duration is known. 
Demuxers already do this ...

Originally committed as revision 22796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 12:20:10 +00:00
Stefano Sabatini
2874c81cc8 Replace all remaining occurrences of AVERROR_NOMEM with 
AVERROR(ENOMEM).

AVERROR_NOMEM is deprecated and will be dropped at the next libavutil
major bump.

Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-03 14:15:00 +00:00
Martin Storsjö
0e64218889 Remove a redundant assignment, found by clang 
Originally committed as revision 22790 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-03 12:16:33 +00:00
Ronald S. Bultje
ff273ddae7 Fix buffer size; should hold 2 32-bit integers in hex = 16 chars + terminating 
zero, so should be 17 bytes, not 9.

Originally committed as revision 22786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 22:08:57 +00:00
Sam Gerstein
f3c68c5b45 ETIME -> ETIMEDOUT. Patch by Sam Gerstein <sgerstein bluefinlab com>. 
Originally committed as revision 22785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 20:14:55 +00:00
Ronald S. Bultje
7b374c9ff2 Another uninitialized value. 
See http://tranquillity.ath.cx/clang/2010-03-30-1/report-e6KUTb.html#EndPath

Originally committed as revision 22783 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 14:58:55 +00:00
Ronald S. Bultje
190413cf81 Fix uninitialized value in codepath. 
See http://tranquillity.ath.cx/clang/2010-03-30-1/report-40QvF3.html#EndPath

Originally committed as revision 22782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 14:58:03 +00:00
Ronald S. Bultje
ddf8e75ede Remove dead initialization. 
Originally committed as revision 22781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 14:56:59 +00:00
Ronald S. Bultje
0b9535b9a2 Remove dead initialization. 
Originally committed as revision 22780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 14:55:01 +00:00
Martin Storsjö
4bebf2cf64 Change a case of CODEC_TYPE_ into AVMEDIA_TYPE_ 
This was accidentally overwritten in the recent merge of the theora/vorbis codepaths

Originally committed as revision 22774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 11:33:02 +00:00
Josh Allmann
339f5f3957 Merge Vorbis / Theora depayloaders. 
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 21:43:22 +00:00
Josh Allmann
cb92a9c038 Reindent after r22766. 
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 21:42:10 +00:00
Josh Allmann
96070b8b5c Rename functions / comments from "Theora" to "Xiph" where relevant. 
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 21:41:48 +00:00
Josh Allmann
06a36faf4c Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging 
the Vorbis / theora depacketizers.

Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 21:40:56 +00:00
Michael Niedermayer
ccf8c2944c Limit probing to probesize. 
Originally committed as revision 22758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 12:09:33 +00:00
Howard Chu
527c2e6429 Fix flvdec start-of-frame. 
Patch by Howard Chu hyc highlandsun com

Originally committed as revision 22757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 08:02:20 +00:00
Stefano Sabatini
1a70d12727 Make av_match_ext() declaration public (move its declaration out of 
the #ifdef HAVE_AV_CONFIG_H block in avformat.h).

Originally committed as revision 22748 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 19:03:03 +00:00
Michael Niedermayer
fe8344a276 Add AVFMT_FLAG_NOFILLIN and AVFMT_FLAG_NOPARSE. 
Originally committed as revision 22745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:55:16 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Joakim Plate
46da7fa133 Probe aac codecs for CODEC_ID_PROBE. 
Patch by Joakim Plate, elupus ecce se

Originally committed as revision 22742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 10:45:15 +00:00
Anton Khirnov
8166c498df Remove superfluous space from a conversion table. 
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 09:22:31 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00