virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
24,407 Commits 37 Branches 400 Tags 460 MiB
3a1350e8d9
Commit Graph

6116 Commits

Author SHA1 Message Date
Google
23966972ab matroska: Add V_VP8 
Patch by Google

Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-19 16:50:06 +00:00
Martin Storsjö
8d168a9207 Fix a crash when opening WMS RTSP streams 
Fixes issue 1948

Originally committed as revision 23181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-19 09:46:29 +00:00
Martin Storsjö
d4493e03b6 Late bump of the minor version, for the addition of AVFMT_FLAG_RTP_HINT 
Originally committed as revision 23179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-19 08:13:13 +00:00
David Conrad
5549aa6d0d matroskadec: Free ebml binary buffer on error 
Based on a Chromium patch

Originally committed as revision 23169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 21:21:37 +00:00
David Conrad
465c28b6b4 matroskadec: Fix buffer overread in matroska_ebmlnum_uint 
Based on a Chromium patch

Originally committed as revision 23168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 21:21:32 +00:00
David Conrad
d98bd80ed3 matroskadec: Ensure time_scale is nonzero, fixes divide-by-zero if the file 
has 0 written

Based on a Chromium patch

Originally committed as revision 23167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 21:21:28 +00:00
David Conrad
1c664b239c matroskadec: Use av_freep in ebml_read_ascii 
Based on a Chromium patch

Originally committed as revision 23166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 21:21:23 +00:00
Martin Storsjö
44bf251a42 Use a heuristic for describing the RTP packets using sample data 
Originally committed as revision 23165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:48:25 +00:00
Martin Storsjö
e977af6f2e Add initial support for RTP hinting in the mov muxer 
Originally committed as revision 23164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:47:24 +00:00
Martin Storsjö
27a826c941 Make mov_write_packet non-static, add ff_ prefix 
Originally committed as revision 23163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:40:17 +00:00
Martin Storsjö
f72dad4142 Move the mov muxer structures to a separate header 
Originally committed as revision 23162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:38:37 +00:00
Martin Storsjö
796ac2335d Add a flag for enabling RTP hinting 
Originally committed as revision 23161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:34:21 +00:00
Martin Storsjö
0341b6994a Make ff_sdp_write_media a lavf-internal function 
This is in preparation for RTP hinting in the MOV muxer, where
it needs to be able to create SDP fragments for each media stream.

Originally committed as revision 23160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:32:59 +00:00
Francesco Lavra
698f4cc7f0 Validate AVCodecTag vs CodecID. 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:23:29 +00:00
Francesco Lavra
603a5f04b2 Factorize some code into the new function ff_toupper4(). 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:16:40 +00:00
Janne Grunau
b74f67eb17 In ts demuxer, output pes packet as soon as they are complete. 
This is needed for subtitles where packets are infrequent.
Patch by Janne Grunau, janne-ffmpeg at jannau dot net.

Originally committed as revision 23157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 17:28:07 +00:00
Baptiste Coudurier
1095d44258 set avg frame rate in mkv demuxer 
Originally committed as revision 23152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-17 18:12:58 +00:00
Stefano Sabatini
73762de18e Add NV12 and NV21 AVI tags. 
Both are listed in fourcc.org.

Originally committed as revision 23145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-16 07:56:31 +00:00
Baptiste Coudurier
58edb075f0 Change MAX_READ_SIZE message during av_find_stream_info to DEBUG level. 
It is not harmful and it scares too many users.

Originally committed as revision 23139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 22:04:39 +00:00
Sebastian Vater
299ac811ba Reindent after r23112. 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 15:41:49 +00:00
Sebastian Vater
65d213ec86 Move handling of paletted data to the IFF demuxer. This allows future 
handling of things such as masking/EHB/HAM for this type of data.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 15:39:40 +00:00
Stefano Sabatini
7693b93e5c Doxygen av_codec_get_id() and av_codec_get_tag(). 
Originally committed as revision 23102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-12 22:17:29 +00:00
Francesco Lavra
f10d3d343e Add FourCC MJPG for CODEC_ID_JPEGLS. 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 23:19:19 +00:00
Stefano Sabatini
b43f432c8c Add support to the Y411 codec tag, corresponding to the rawvideo pixel 
format uyyvyy411.

The codec tag is referenced in fourcc.org.

Originally committed as revision 23072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 22:56:04 +00:00
Stefano Sabatini
8e89cd1fee Make the nut demuxer issue a more meaningful error message if it 
cannot recognize the provided codec tag.

Originally committed as revision 23071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 22:56:02 +00:00
Sebastian Vater
0613ece542 Replace usage of s->streams[0]->* with st->*, which is shorter. 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 20:10:48 +00:00
Michael Niedermayer
cb0061d453 Favor chunk size over hitting the correct position after reading the chunk size in asf. 
Fixes issue1923

Originally committed as revision 23040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 08:08:09 +00:00
Sebastian Vater
8af7dbce61 Parse IFF metadata. 
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 23024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 17:26:59 +00:00
David Conrad
ddb630177a movenc: Write QuickTime chapters 
Originally committed as revision 23022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:10 +00:00
David Conrad
1b206f62ea movenc: Swap positions of mov_write_header and mov_write_packet 
Originally committed as revision 23021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:06 +00:00
David Conrad
1cf9f6ed4f mov: Read nero chapters 
Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:01 +00:00
Thierry Foucu
e1954bb5ca Do not use pkt->size when it is potentially uninitialized. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 23017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-04 17:17:16 +00:00
Reimar Döffinger
c99d506b3b Fix off-by-one errors in description of score_max argument for 
av_probe_input_format2

Originally committed as revision 23004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 15:36:51 +00:00
Reimar Döffinger
8e2ee182fa Export av_probe_input_format2. 
Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 13:49:35 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues. 
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-28 20:00:23 +00:00
Anssi Hannula
337104ac1f Fix FourCC when remuxing VP6F, regression introduced in r22941. 
Patch by Anssi Hannula, anssi D hannula A iki fi

Originally committed as revision 22985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-28 07:57:07 +00:00
Sebastian Vater
4f5e6ef16e Reindent after rr22977. 
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-27 14:04:11 +00:00
Sebastian Vater
46dcabf82b Make the IFF demuxer a little more standards-compliant, e.g. respect the size 
fields of common media header chunks (these can have different sizes depending
on the type of IFF file you read), better handle odd sizes (like RIFF, every
field is padded to word) and handle headerchunks after the BODY chunk.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-27 14:03:47 +00:00
Stefano Sabatini
ec6791736c Make file_open() return the error code set in errno if open() fails, 
rather than always ENOENT.

Originally committed as revision 22972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:36:51 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Baptiste Coudurier
0403c2e3e4 Disable LATM AAC in mpegts, this is not supported and produce too many 
bug reports. Also warn the user about it.

Originally committed as revision 22947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 20:34:30 +00:00
Jai Menon
037e9afd37 Fix off-by-1 error in the tag parsing code. 
Originally committed as revision 22945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 12:54:50 +00:00
Tomas Härdin
951776c478 Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep". 
Originally committed as revision 22942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 09:04:33 +00:00
Christian Schmidt
03cb8458ce Support VP6F in Matroska. 
Patch by Christian Schmidt, schmidt digadd de

Originally committed as revision 22941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 08:57:28 +00:00
Stefano Sabatini
9d30e0682a Do not initialize res in url_fseek(), in the case !s->seek directly 
return AVERROR(EPIPE) rather than the pre-defined value of res.

Slightly improve readability.

Originally committed as revision 22939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 21:19:25 +00:00
Vitor Sessak
10fa22ccfb Fix MTV decoding on big-endian systems 
Originally committed as revision 22929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 13:00:48 +00:00
David Conrad
7221579b0c mov: Read QuickTime chapters 
Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 06:36:09 +00:00
David Conrad
dc75e4e3b3 movenc: Write nero chapters 
Originally committed as revision 22927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 06:36:05 +00:00
Baptiste Coudurier
f7501a71a1 seems aac gets screwed up by the parser so disable it 
Originally committed as revision 22926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 21:23:49 +00:00
Baptiste Coudurier
dc1c26dc8e parse stream headers for audio streams in mkv, needed for frame size 
Originally committed as revision 22925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 21:19:27 +00:00
Sebastian Vater
e595346486 Reindent / reformat some code with broken indenting. 
Patch by Sebastian Vater <cdgs DOT basty googlemail com>.

Originally committed as revision 22924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 18:40:45 +00:00
Sebastian Vater
bf29cbc2cc Change a %2 to &1. Patch by Sebastian Vater <cdgs DOT basty googlemail com>. 
Originally committed as revision 22922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 17:05:02 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Diego Biurrun
e1ae1642cb Add missing internal.h #include for brktimegm(), fixes the warning: 
libavformat/dvenc.c:82: warning: implicit declaration of function ‘brktimegm’

Originally committed as revision 22920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:41:55 +00:00
Martin Storsjö
5948f82227 Reset RTCP timestamps after seeking, add range start offset to the packets timestamps 
If these aren't reset, the timestamps make a huge jump when the next RTCP
is received.

Originally committed as revision 22918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 07:38:52 +00:00
Martin Storsjö
2cab6b48ad Revert svn rev 21857, readd first_rtcp_ntp_time in RTPDemuxContext 
In order to sync RTP streams that get their initial RTCP timestamp at
different times, propagate the NTP timestamp of the first RTCP packet
to all other streams.

This makes the timestamps of returned packets start at (near) zero instead
of at any random offset.

Originally committed as revision 22917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 07:34:28 +00:00
Baptiste Coudurier
2293a2e67f Set AVFMT_NOTIMESTAMPS flag for mp3 muxer 
Fixes issue 1026

Originally committed as revision 22916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 01:41:00 +00:00
Luca Barbato
9094d867aa Make rtp protocol obey rfc3550 
Originally committed as revision 22906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-19 11:40:45 +00:00
Howard Chu
fc8fa007fb Implement librtmp seek support. 
Implement flv_read_seek(), add a missing check on stream_index
and fix timestamp rounding in rtmp_read_seek().

Also add the flv_read_seek2() function, which is not enabled but is
useful as reference.
To actually implement flv_read_seek2() correctly, there would need to
be some corresponding av_url_read_fseek2() function to propagate the
timestamps down to the ByteIOContext and URLContext.

Patch by Howard Chu <hyc <at> highlandsun.com>.

See the thread:
Subject: [FFmpeg-devel] RTMP seek support
Date: 2010-03-28 23:35:02 GMT

Originally committed as revision 22904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-18 19:09:25 +00:00
Stefano Sabatini
d79fc8403b Prefer AVERROR(ENOSYS) over AVERROR_NOTSUPP. 
AVERROR_NOTSUPP is (maybe) going to be deprecated.

Originally committed as revision 22903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-18 19:09:22 +00:00
Stefano Sabatini
4c4ef3db4b Make url_fsize() return AVERROR(ENOSYS) rather than AVERROR(EPIPE) if 
the seek operation is not defined in the ByteIOContext.

Originally committed as revision 22902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-18 17:37:21 +00:00
Stefano Sabatini
28894105c8 Make url_seek() return AVERROR(ENOSYS) rather than AVERROR(EPIPE) in 
the case where the seek operation is not defined in the protocol
handler.

Originally committed as revision 22901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-18 17:37:16 +00:00
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
Benoit Fouet
32e543f866 Replace @returns by @return. 
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 15:50:57 +00:00
Stefano Sabatini
8a36b59ba6 Document url_exist(). 
Originally committed as revision 22725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 22:29:14 +00:00
Mohamed Naufal
148bcae98c Implement YOP demuxer and video decoder. 
Patch by Mohamed Naufal gmailify(naufal11).

Originally committed as revision 22724 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 22:17:01 +00:00
Reimar Döffinger
c2bfd81605 Some spelling fixes. 
Originally committed as revision 22720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 19:17:49 +00:00
Sam Gerstein
9cba6f5f40 Add a timeout to the select() call. Patch by Sam Gerstein <sgerstein bluefinlab 
com>.

Originally committed as revision 22718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 17:36:08 +00:00
Howard Chu
0f943ce663 Implement support to RTMP, RTMPT, RTMPE, RTMPTE, RTMPS protocols via 
librtmp.

Patch by Howard Chu <hyc * highlandsun * com>.

Originally committed as revision 22710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 13:39:36 +00:00
Stefano Sabatini
9bee245954 Document url_seek(). 
Originally committed as revision 22709 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 10:31:22 +00:00
Vitor Sessak
f990f6e3f7 Fix NUT (de)muxer warnings: 
CC    libavformat/nutdec.o
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
CC    libavformat/nutenc.o
libavformat/nutenc.c: In function ‘write_packet’:
libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’

Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 09:59:58 +00:00
Martin Storsjö
4c1202f76e Initialize ssrc and base_timestamp using ff_random_get_seed() 
Originally committed as revision 22706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 08:48:45 +00:00
Aurelien Jacobs
9b1db5ec99 correct first pts for ogg skeleton 
Originally committed as revision 22705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 01:15:08 +00:00
Stefano Sabatini
66b6c7458e Document the behavior of av_metadata_get() if the prev parameter is 
NULL.

Originally committed as revision 22704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-27 21:14:16 +00:00
Reimar Döffinger
d14f5391c1 Use more appropriate return values in txd demuxer. 
Originally committed as revision 22703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-27 19:10:24 +00:00
Reimar Döffinger
36031c2033 eacdata: fix a memleak, return partial packets and use proper return values. 
Originally committed as revision 22702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-27 19:09:46 +00:00
Martin Storsjö
cae9a15c98 Don't report EINTR from select as an error, retry select instead 
Originally committed as revision 22694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-26 16:04:38 +00:00
Micah F. Galizia
532aa889eb Fix updating condition for the probe_size variable in the internal 
loop of ff_probe_input_buffer(), making sure that probe_size is always
set to probe_max_size in the last iteration.

Also make the function return an error if we get to the max probe
length and still cannot figure out what the format is.

Patch by Micah Galizia micahgalizia A gmail D com.

Originally committed as revision 22688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-26 01:12:14 +00:00
Martin Storsjö
4bc5cc2313 Reassemble the RTSP URL before replacing hostname with the numerical IP 
Originally committed as revision 22681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 22:21:09 +00:00
Martin Storsjö
7b4a36450b Simplify ff_rtsp_send_cmd_with_content_async, remove an unnecessary buffer 
Originally committed as revision 22680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 22:04:41 +00:00
Martin Storsjö
60f198a774 Remove a redundant null pointer check 
Originally committed as revision 22679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:53:42 +00:00
Martin Storsjö
30af077942 Don't force basic auth in RTSP, but retry with the server-specified method on failure 
Originally committed as revision 22678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:49:43 +00:00
Martin Storsjö
2626308abb Actually parse the auth headers in RTSP 
Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:48:58 +00:00
Martin Storsjö
aa8bf2fb80 Make RTSP use the generic http authentication code 
Still hardcoded to use Basic auth, without parsing the reply headers

Originally committed as revision 22676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:47:33 +00:00
Martin Storsjö
b17d11c632 Add separate method/url parameters to the rtsp_send_cmd functions 
Originally committed as revision 22675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:46:14 +00:00
Martin Storsjö
e9fea405a7 Reindent 
Originally committed as revision 22672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 19:47:26 +00:00
Jai Menon
4896dd57fa Matroska muxer : Don't create audio tracks for unsupported audio codecs. 
Originally committed as revision 22669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 14:34:19 +00:00
Martin Storsjö
855e7732c6 Add support for http digest authentication 
Originally committed as revision 22667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 13:58:26 +00:00
Martin Storsjö
d8f9295753 Reindent 
Originally committed as revision 22666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 07:14:41 +00:00
Martin Storsjö
ddbeb95447 Add a lowercase parameter to ff_data_to_hex 
Originally committed as revision 22665 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 07:13:20 +00:00
Martin Storsjö
b1cc5540e7 Make ff_rtsp_send_cmd simply call ff_rtsp_send_cmd_with_content 
Originally committed as revision 22663 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 23:06:58 +00:00
Vitor Sessak
3bfb30b9e3 Fix warnings in NUT demuxer: 
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 4 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘void **’ but argument is of type ‘struct Syncpoint **’
libavformat/nutdec.c:871: warning: passing argument 4 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘void **’ but argument is of type ‘struct Syncpoint **’

Originally committed as revision 22662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 22:44:06 +00:00
Luca Barbato
7ed8211b3e Issue a warning if the received CSeq isn't the expected one 
Originally committed as revision 22661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 22:38:48 +00:00
Martin Storsjö
9405f733d9 Split out http authentication handling into a separate file 
This prepares for adding support for more authentication methods

Originally committed as revision 22660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 22:32:05 +00:00
Vitor Sessak
59856b9891 Fix warning: 
libavformat/nut.c: In function ‘ff_nut_free_sp’:
libavformat/nut.c:80: warning: passing argument 4 of ‘av_tree_enumerate’ from incompatible pointer type
./libavutil/tree.h:92: note: expected ‘int (*)(void *, void *)’ but argument is of type ‘void (*)(void *, void *)’

Originally committed as revision 22659 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 19:58:12 +00:00
Martin Storsjö
3032276b18 Handle errors returned from ff_rtsp_read_reply in udp_read_packet properly 
Originally committed as revision 22657 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 18:52:27 +00:00
Zhentan Feng
852e0ca555 Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier 
to share it with e.g. MMS.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 22656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 18:40:43 +00:00
Carl Eugen Hoyos
d692850bbb Silence ridiculous gcc warning. 
Originally committed as revision 22654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 11:11:25 +00:00
Tomas Härdin
c6a5e087cf Mask away AVSEEK_FORCE properly in some checks in url_fseek() 
Patch by Tomas Härdin $(name).$(s/ä/a/ $(surname)) AT codemill DOT se

Originally committed as revision 22653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 10:41:58 +00:00
Justin Ruggles
06ebe9161e Put ff_flac_write_header() in a separate C file to allow it to be shared without 
duplicating code or adding a dependency on vorbiscomment.o.

Originally committed as revision 22652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 23:58:45 +00:00
Tomas Härdin
d40a999a1c Fix seeking in DV when filesize is unknown. 
Patch by Tomas Härdin, tomas D hardin A  codemill D se

Originally committed as revision 22645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 17:22:25 +00:00