ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-09 19:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,389 Commits 37 Branches 400 Tags 508 MiB
42c63263d1
Commit Graph

6327 Commits

Author SHA1 Message Date
Stefano Sabatini
83c2707908 Prefer enum CodecID over int in ff_codec_get_tag(). 
Originally committed as revision 23249 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 15:56:49 +00:00
David Conrad
577abedb39 matroskaenc: Don't write track timecode scale 
It's not required for mkv and unsupported in webm

Originally committed as revision 23247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 01:41:38 +00:00
David Conrad
c7b913c8ad matroskadec: Allow unknown EBML doctype 
Originally committed as revision 23246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 01:41:35 +00:00
James Zern
470491faed matroskadec: Support webm doctype 
Patch by James Zern <jzern at google>

Originally committed as revision 23245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 01:41:32 +00:00
Baptiste Coudurier
ff85f58605 remove unused field 
Originally committed as revision 23232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 21:41:38 +00:00
Baptiste Coudurier
95ca3b1e20 In ogg muxer, pack multiple frames into one page, much lower overhead 
Originally committed as revision 23231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 21:38:54 +00:00
Martin Storsjö
38d4a21778 Change the default codecs for the rtsp muxer to mpeg4 and aac 
These codecs in RTP are supported by many players.

Originally committed as revision 23209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:12:33 +00:00
Martin Storsjö
648e41b342 Take ff_write_chained in use in the mov rtp hinter and in the rtsp muxer 
Originally committed as revision 23208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:08:29 +00:00
Martin Storsjö
9a76125069 Add a libavformat internal function ff_write_chained 
Originally committed as revision 23207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:07:57 +00:00
Michael Niedermayer
fbfccc0404 Disable non interleaved avi code when there is no index available. 
Fixes issue1956.

Originally committed as revision 23202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-20 18:34:44 +00:00
Google
6c7c62939b Add VP80 fourcc 
Patch by Google

Originally committed as revision 23193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-19 16:50:12 +00:00
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
Martin Storsjö
7a033e08ea Handle multiple RTSP transport options properly by adding all of them into the mask 
Originally committed as revision 22644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 08:00:37 +00:00
Martin Storsjö
602eb77975 Parse options in the RTSP URL only from the last question mark onwards 
This helps if the URL (erroneously?) contains question marks within the path.

Originally committed as revision 22643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 07:59:23 +00:00
Martin Storsjö
2a21adf924 Reconstruct the RTSP URL, in order to remove the auth part from the URL sent to the server 
Don't modify the user-specified s->filename at all, keep all modifications
locally and in rt->control_uri.

Originally committed as revision 22642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 07:55:15 +00:00
Justin Ruggles
19de452a63 Move ff_flac_write_header() to flacenc.h, which removes the Matroska muxer's 
dependency on flacenc.o and fixes the unnecessary dependency on vorbiscomment.o.

Originally committed as revision 22639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 21:58:38 +00:00
Michael Niedermayer
c51131290c Dont senselessly fail on rawvideo that isnt 3 files per frame. 
Originally committed as revision 22637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 20:18:42 +00:00
Josh Allmann
887af2aa12 RTP depacketization of Theora 
Patch by Josh Allmann (joshua allmann gmail com)

Originally committed as revision 22636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 16:26:29 +00:00
Martin Storsjö
685e76b554 Reindent 
Originally committed as revision 22635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 15:07:36 +00:00
Martin Storsjö
b7dc88fc68 Add support for TCP as lower transport in the RTSP muxer 
Originally committed as revision 22634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 15:07:05 +00:00
Martin Storsjö
9dff2308ba Interpret valueless attributes in AMR ftmp lines as being 1 
Originally committed as revision 22631 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 14:44:28 +00:00
Martin Storsjö
6e69f6c47f Use the caller's RTSPMessageHeader in rtsp_setup_input_streams 
Currently, the caller doesn't get the status_code and location for rediects,
since rtsp_setup_input_streams uses a copy of RTSPMessageHeader of its own.

Originally committed as revision 22630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-22 14:42:52 +00:00
James Darnley
bb45237e11 Fix FLAC demuxer dependencies. 
Patch by James Darnley <james darnley at gmail>

Originally committed as revision 22627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 18:06:56 +00:00
Stefano Sabatini
2928b83c75 Make av_open_input_file() return AVERROR_INVALIDDATA rather than 
AVERROR_NOFMT if the format is unknown / cannot be recognized.

It is returned AVERROR_INVALIDDATA, in the sense that the data is
invalid within what the specific libav* binary supports.

That was the last remaining use of AVERROR_NOFMT, which is going to be
dropped at the next libavutil major bump.

Originally committed as revision 22625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 16:34:04 +00:00
Justin Ruggles
59b4b54014 Add Changelog entry and bump lavf micro version for the addition of 
VorbisComment writing for FLAC, Ogg/FLAC, and Ogg/Speex files.

Originally committed as revision 22607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 13:42:49 +00:00
James Darnley
aeef3ec6f0 Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files. 
Patch by James Darnley <james darnley at gmail>

Originally committed as revision 22606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 13:39:22 +00:00
James Darnley
66061a1220 Add VorbisComment writing to FLAC files. 
Patch by James Darnley <james darnley at gmail>.

Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 13:36:43 +00:00
Stefano Sabatini
8d5e638f04 Make url_fseek() return AVERROR_EOF rather than AVERROR(EPIPE) if end 
of file is reached.

Originally committed as revision 22590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-18 00:22:58 +00:00
Ronald S. Bultje
a7a85dc4c2 Cast sample_fmt (as read from bitstream as a 16-bit value) to int16, so that 
negative values, e.g. SAMPLE_FMT_NONE (-1), are read correctly also.

Originally committed as revision 22585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 15:14:18 +00:00
Måns Rullgård
c7f625eecf Fix erroneous behaviour when format probe hits end of file 
If the format probe hits end of file, do not add the error code
to the buffer position.  This is obviously wrong, and with a
small input file would cause a negative buffer overflow.

Fixes issue 1818.

Originally committed as revision 22571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-16 21:45:30 +00:00
Aurelien Jacobs
972ffe6220 rename av_read_frame_flush to ff_read_frame_flush 
it is an internal function, not part of public API

Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:15:24 +00:00
Aurelien Jacobs
588af13fee rename av_program_add_stream_index to ff_program_add_stream_index 
it is an internal function, not part of public API

Originally committed as revision 22561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:14:07 +00:00
Greg Maxwell
fbe8c56dfe Correctly write last 0 lacing value when packet size is multiple of 255, patch by Greg Maxwell, gmaxwell at gmail dot com 
Originally committed as revision 22559 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:04:09 +00:00
Michael Niedermayer
493f54ada0 Add AVSEEK_FORCE flag to indicate that the code should attempt to seek 
by any means.

Originally committed as revision 22557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 22:54:22 +00:00
Aurelien Jacobs
6dfa52c8bd matroskadec: fix missing dependency 
Originally committed as revision 22555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 22:37:14 +00:00
Jai Menon
f75ab7a645 cosmetics : Print newline after error message. 
Originally committed as revision 22551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 19:03:48 +00:00
Martin Storsjö
db128802c5 Reindent 
Originally committed as revision 22549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:36:54 +00:00
Martin Storsjö
ad2ae6dbaf Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet. 
Skip interleaved packets manually and recheck if there's more to be read.

Originally committed as revision 22548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:36:20 +00:00
Martin Storsjö
ec55edba31 Make rtsp_skip_packet non-static, add ff prefix 
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:31:15 +00:00
Martin Storsjö
c040badb70 Reindent 
Originally committed as revision 22546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:15:51 +00:00
Martin Storsjö
c07c6f8183 RTSP: Synchronize the start time of the chained RTP muxers 
This makes sure that the streams get correctly synchronized when viewed,
previously the streams were out of sync by as much time as it took
between the initialization of the individual muxers.

Originally committed as revision 22545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 14:20:07 +00:00
Martin Storsjö
b1d55e5e4f Use AVFormatContext.start_time_realtime in the RTP muxer 
Originally committed as revision 22543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 10:37:12 +00:00
Martin Storsjö
2dad0dcec6 Move the NTP offset definitions to internal.h 
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 10:36:30 +00:00
Martin Storsjö
b8819c85b5 Add a new field AVFormatContext.start_time_realtime 
Currently intended to be used by the RTP muxer

Originally committed as revision 22540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 10:29:37 +00:00
Anton Khirnov
63100f5885 riff: don't pad extradata when writing ASF. 
Patch by Anton Khirnov mirror(moc liamg saksyw)

Originally committed as revision 22539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 08:49:02 +00:00
Aurelien Jacobs
e536ccd653 matroskadec: use more appropriate error code 
Originally committed as revision 22535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 00:19:22 +00:00
Aurelien Jacobs
e4a9e3cc7c move ff_url_split() and ff_url_join() declarations to internal.h 
those functions are not part of the public API

Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 23:59:48 +00:00
Micah F. Galizia
eadd495d06 Move the probe loop from av_open_input_file() into its own method 
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

New attempt after r22296, which was revert in r22315 due to a FATE
failure.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Move av_open_input_file probe loop to its own method
Date: 2010-03-05 03:23:57 GMT

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 22:40:16 +00:00
Reimar Döffinger
28eb577390 Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in 
huge processing and memory usage overhead for avi files with raw PCM audio.

Originally committed as revision 22521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 13:38:00 +00:00
Stefano Sabatini
5ae092ee34 Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark 
AVERROR_EIO for deletion at the next major bump.

Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 19:19:44 +00:00
David Conrad
3477897e5a oggdec: Set packet duration for ogm streams 
Originally committed as revision 22493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 05:55:57 +00:00
Aurelien Jacobs
6b10228a55 matroskadec: add support for SIPR audio tracks 
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 23:49:06 +00:00
Aurelien Jacobs
1ab0406db1 export rm_reorder_sipr_data() for future use by matroska demuxer 
Originally committed as revision 22491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 23:35:59 +00:00
Aurelien Jacobs
adae9fa65e export sipr_subpk_size for future use by matroska demuxer 
Originally committed as revision 22490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 23:34:30 +00:00
David Conrad
81b743eb10 oggdec: Pass packets to header() until the stream is done with them 
This fixes some old ogm files that had the 3rd vorbis header after a data
packet in another stream. This is invalid in ogg, but this change shouldn't
affect the behaviour of any valid file.

Originally committed as revision 22478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:17:01 +00:00
David Conrad
8730fad595 oggdec: Parse ogm chapters 
Originally committed as revision 22477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:57 +00:00
David Conrad
2e5085854c oggdec: Cosmetics 
Originally committed as revision 22476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:54 +00:00
David Conrad
d8ba748359 oggdec: Read ogm metadata 
Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:51 +00:00
David Conrad
533c30fced Const correctness for vorbis_comment 
Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:47 +00:00
David Conrad
b53cde48bd oggdec: Metadata is per-stream; don't merge multiple streams' together 
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:44 +00:00
David Conrad
e4d2d8c5d7 Add ff_ prefix to vorbis_comment 
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:39 +00:00
Martin Storsjö
34056cbba5 Fix a crash in the H.263 RTP packetizer 
If size == 1 and buf[0] == 0 and buf[1] == 0 (the first byte after the
buffer), it would set size = -1 and crash in the later memcpy.

Originally committed as revision 22469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 16:26:14 +00:00
Peter Ross
70b462cc29 Prevent memory leak introduced in r22389 in Bink demuxer: pass partial packets to decoder. 
Originally committed as revision 22468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 12:29:02 +00:00
Martin Storsjö
5c7fd91010 Cosmetics, break a long line, fix brace placement 
Originally committed as revision 22465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 08:33:04 +00:00
Martin Storsjö
26cb700c82 RTSP muxer: Create the SDP with the numerical IP of the peer 
instead of using the original host name

Originally committed as revision 22464 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 08:24:18 +00:00
David Conrad
d8b91fae1d oggdec: Seek to keyframes 
Originally committed as revision 22463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:18:00 +00:00
David Conrad
873d117e4b oggdec: Determine pts and filepos on a packet basis in read_timestamp 
This takes into account whether the granule defines the start or end times
of packets, and sets the correct file offset of the associated page.

Originally committed as revision 22462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:56 +00:00
David Conrad
6abaa27211 oggdec: Move PTS/DTS calculation to a function 
Originally committed as revision 22461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:53 +00:00
David Conrad
2ac41150c0 oggdec: Fix memory leak in setting up vorbis headers 
Originally committed as revision 22460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:49 +00:00
David Conrad
8f8320d7c3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers 
Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:46 +00:00
David Conrad
77560b0ef1 oggdec: Fix duration calculation for streams with non-zero start 
Originally committed as revision 22458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:43 +00:00
David Conrad
32ad869284 oggdec: Parse skeleton to determine the start time of each stream 
Originally committed as revision 22457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:40 +00:00
David Conrad
296bdf9cf1 oggdec: Check that we have a codec in gptopts (needed for skeleton) 
Originally committed as revision 22456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:36 +00:00
David Conrad
dfaed51f04 oggdec: Move ogg_find_stream and ogg_gptopts to oggdec.h 
(skeleton will need them)

Originally committed as revision 22455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:33 +00:00
David Conrad
50a9d32310 oggdec: Set data_offset to the right value 
Otherwise it gets set automatically to a page midstream and prevents seeking
to the first page.

Originally committed as revision 22454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:29 +00:00
David Conrad
73823cb941 oggdec: Save offset of the page needed to reconstruct the current packet 
Originally committed as revision 22453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:24 +00:00
Martin Storsjö
594a9aebbe Make the ntp_time function available to other parts of libavformat, as ff_ntp_time 
Originally committed as revision 22438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 22:21:39 +00:00
Benoit Fouet
114a93c700 Fix ffm_close return type. 
Originally committed as revision 22432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 14:26:15 +00:00
Vitor Sessak
2dc22a64b4 Fix memory leak in FFM demuxer 
Originally committed as revision 22431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 13:17:50 +00:00
Baptiste Coudurier
83c2bc7abb In mpegts muxer, free adts context and temporary data 
Originally committed as revision 22428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 09:20:32 +00:00
Baptiste Coudurier
e3433702ae reindent 
Originally committed as revision 22427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 09:19:14 +00:00
Dave Yeo
cbfa66d0cf Include os_support.h which has a fallback declaration of socklen_t 
This fixes compilation on some OSes

Patch by Dave Yeo, daveryeo at telus dot net

Originally committed as revision 22426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 07:44:51 +00:00
Dave Yeo
611b17d79b Using struct timeval requires sys/time.h, fixes compilation on some OSes 
Patch by Dave Yeo, daveryeo at telus dot net

Originally committed as revision 22425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 07:43:56 +00:00
Martin Storsjö
db76ca7f35 Use rt->control_uri consequently instead of s->filename in all RTSP commands 
Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 16:04:41 +00:00
Michael Niedermayer
67c10de7d2 Add special case to avoid binary search when appending index entries. 
Originally committed as revision 22400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 15:19:23 +00:00
Martin Storsjö
03f8fc0897 RTSP: Resolve and use the actual IP address of the peer we're connected to, 
instead of using the original host name, since the RTP (and UDP) protocols
may choose another IP address if the host name resolves into several different
addresses.

Originally committed as revision 22398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 14:59:40 +00:00
Peter Ross
fb6a32c30f Remove static function name prefixes from American Laser Games MM demuxer 
Originally committed as revision 22390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 12:37:13 +00:00
Peter Ross
cc4e8b1267 Ensure Bink demuxer returns AVERROR code when av_get_packet() fails 
Originally committed as revision 22389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 12:32:08 +00:00
David Conrad
f9ff7179ff mkvenc: Handle negative timestamps correctly 
Originally committed as revision 22372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 04:23:36 +00:00
David Conrad
654b65d012 mkvenc: Don't try to write packets with unknown timestamps 
Originally committed as revision 22371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 04:23:33 +00:00
David Conrad
84d4e599a5 mkvenc: write dts for VFW mode 
Originally committed as revision 22370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 04:23:28 +00:00
Baptiste Coudurier
fe3ab8adfa Fix encoder metadata string langcode in mov muxer 
Originally committed as revision 22369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 01:53:16 +00:00
Baptiste Coudurier
cc255afeb5 Correctly mark mov metadata as utf-8, using iso language code 
Originally committed as revision 22368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 01:21:09 +00:00
Baptiste Coudurier
08a186c648 In mov demuxer, convert mac encoded strings to utf-8 
Originally committed as revision 22365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 01:03:42 +00:00
Daniel Verkamp
bf35412201 Kega Game Video (KGV1) decoder 
Originally committed as revision 22364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 01:03:09 +00:00
Baptiste Coudurier
987e857f63 Preallocate index entries in mov demuxer, huge speedup 
Originally committed as revision 22363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 00:46:26 +00:00
Baptiste Coudurier
8fdd542ce4 In mpegts muxer, write adts header if aac bitstream does not contain it 
Originally committed as revision 22355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 00:18:49 +00:00
Baptiste Coudurier
e17d77bb67 In mpegts muxer, search for h264 aud nal, it might not be the first nal. 
Improve ther error message when bitstream is malformated and tell user to use
the bitstream filter.

Originally committed as revision 22354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 23:59:05 +00:00
Stefano Sabatini
f4495cdc00 Remove definition of match_ext(), which is declared under #ifdef 
HAVE_AV_CONFIG_H and so not publicly declared, and currently unused.

Originally committed as revision 22353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 23:51:53 +00:00
Baptiste Coudurier
7082ea56c8 mpegts vbr muxing, activated when muxing rate is not supplied by the 
user.

Originally committed as revision 22352 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 23:46:19 +00:00
Stefano Sabatini
4837bb52d2 Replace last occurrence of the deprecated match_ext() with 
av_match_ext().

Originally committed as revision 22351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 23:46:04 +00:00
Baptiste Coudurier
677a1144b0 Start continuity counter at 0 for pmt as well 
Originally committed as revision 22350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 22:44:03 +00:00
Baptiste Coudurier
d73a458f27 Start continuity counter at 0 for streams 
Originally committed as revision 22344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 20:59:00 +00:00
Baptiste Coudurier
9169174fd6 10l typo, fix ts total bit rate computation 
Originally committed as revision 22343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 20:57:42 +00:00
Måns Rullgård
22f73dccad Move resolve_host() to ffserver.c 
This deprecated function is only used by ffserver, yet does not have
a prototype visible there.

In the long term, ffserver should be made IPv6-aware.  In the meantime,
this change removes cruft from lavf and fixes some warnings in ffserver.

Originally committed as revision 22329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 18:43:27 +00:00
Vladimir Pantelic
88b51ea948 Use ASF supports "markers" which are a name and a time stamp to create 
lavf chapters.
Patch by Vladimir Pantelic pan (arobase) nt tu (dash) darmstadt de

Originally committed as revision 22326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 13:13:18 +00:00
Martin Storsjö
002a6d0ea6 Add doxygen documentation for ff_url_split 
Originally committed as revision 22323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 09:07:41 +00:00
Martin Storsjö
f984dcf6dd Reindent 
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 09:05:03 +00:00
Martin Storsjö
c5c6e67c28 Rename url_split to ff_url_split 
Since this function isn't in the public API, it should have an ff_ prefix.

Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 09:03:25 +00:00
Måns Rullgård
f19341e17a Revert "Move the probe loop from av_open_input_file() into its own method" 
This reverts r22296.  This change made some files to fail to open.
The patch submitter has promised to investigate next week.

Originally committed as revision 22315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 03:46:37 +00:00
Måns Rullgård
d9747e29b6 IFF: move ff_cmap_read_palette() prototype to a header file 
Originally committed as revision 22307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 02:36:00 +00:00
Wolfram Gloger
ae2c694388 Fix concat seeking SEEK_END case. 
Patch by Wolfram Gloger wmglo ^ dent.med.uni-muenchen.de.

Originally committed as revision 22306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 00:40:22 +00:00
Wolfram Gloger
35eaadcba0 Fix concat seek result. 
Patch by Wolfram Gloger wmglo AT-SIGN dent.med.uni-muenchen DOT de.

Originally committed as revision 22302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 00:22:03 +00:00
Alex Converse
e7e291e960 av_find_stream_info(): Add a workaround for backwards compatible HE-AAC signaling. 
The sample rate, frame size, and channel count from the container are
not reliable when backwards compatible signaling is used.

Originally committed as revision 22301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 00:00:50 +00:00
Daniel Kristjansson
663322c1b8 Fix pts->dts conversion init for non-zero initial value for pts. 
Patch by Daniel Kristjansson, danielk cuymedia net

Originally committed as revision 22297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 23:10:18 +00:00
Micah F. Galizia
4245c6ec4e Move the probe loop from av_open_input_file() into its own method 
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 22:42:11 +00:00
David Conrad
38c3b6e73e inet_aton needs _DARWIN_C_SOURCE on OS X 
Originally committed as revision 22285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 19:49:02 +00:00
David Conrad
ac11d562e5 Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c 
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 19:48:59 +00:00
Kostya Shishkov
f3cb1cd078 1l trocadero: forgot reference operator on bytestream_get_be32() argument 
Originally committed as revision 22277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 08:52:53 +00:00
David Conrad
457c08ba3c Add internal.h include for av_read_frame_flush prototype 
Fixes build with clang

Originally committed as revision 22273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 02:35:45 +00:00
David Conrad
148e8f2d29 Fix warning about incompatible pointer types 
Originally committed as revision 22272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 02:26:34 +00:00
David Conrad
e48f7ff3cb matroskadec: Fix a buffer overread 
Originally committed as revision 22271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 02:26:30 +00:00
Måns Rullgård
e16c73e67e Move av_read_frame_flush() prototype to lavf/internal.h 
Originally committed as revision 22268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 23:19:05 +00:00
Måns Rullgård
c26e58e32c Add some missing #includes 
Originally committed as revision 22258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:36 +00:00
Reimar Döffinger
5189573c6d Set GXF fallback time-base to match the one specified for audio-only. 
Originally committed as revision 22257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:25:53 +00:00
Reimar Döffinger
192c14fa55 GXF time base is always based on "fields" per second even for 
non-interlaced video.
Should fix issue 1766.

Originally committed as revision 22256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:20:33 +00:00
Martin Storsjö
814c56413d Don't explicitly initialize networking in the tcp and udp protocols 
Networking is always initialized when opening protocols.

Originally committed as revision 22227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 22:38:48 +00:00
Martin Storsjö
57b5555c91 Use ff_url_join for assembling URLs, instead of snprintf 
This ensures proper escaping of numerical IPv6 addresses.

The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.

Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 22:35:21 +00:00
Martin Storsjö
780d7897a9 Add a function ff_url_join for assembling URLs 
Originally committed as revision 22225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 22:31:45 +00:00
Martin Storsjö
67d4b3f205 Always call ff_network_init/ff_network_close when opening protocols 
ff_network_init is a no-op on all platforms except windows, and on
windows the performance penalty is minimal (less than 1 ms in my tests).

Originally committed as revision 22224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 22:30:21 +00:00
Vitor Sessak
5301a05d3e Fix memory leak in NUT muxer 
Originally committed as revision 22222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 17:26:34 +00:00
Martin Storsjö
886f3f2f36 Return from rtp_read when select returns an error 
Originally committed as revision 22219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 08:15:20 +00:00
David Conrad
8b6bdb6cf3 oggdec: Parse theora headers since ogg might not mark keyframes 
Fixes issue746

Originally committed as revision 22214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 00:22:40 +00:00
Martin Storsjö
c2b40ac229 Check url_interrupt_cb in rtp_read, wait in select for max 100 ms before rechecking url_interrupt_cb 
Originally committed as revision 22209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 15:08:54 +00:00
Peter Ross
6c88dc3dbf handle errors reported by av_get_packet() in Bink demuxer 
Originally committed as revision 22208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 13:27:53 +00:00
Peter Ross
4ffa6e78c2 Guard against invalid memory read 
Originally committed as revision 22207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 13:26:01 +00:00
David Conrad
871b641b80 Ensure that we write clusters and blocks with known size when streaming 
Too many demuxers can't cope with clusters of unknown size.

Originally committed as revision 22201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 08:53:14 +00:00
David Conrad
434a70b8f1 Fix indentation 
Originally committed as revision 22200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 08:53:11 +00:00
David Conrad
30f06a58a0 Simplify starting and ending clusters 
Originally committed as revision 22199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 08:53:08 +00:00
David Conrad
7a2a484081 Write the first seekhead if writing to a stream, we won't be able to seek 
back and write it at the end

Originally committed as revision 22198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 08:53:04 +00:00
David Conrad
2529bb3019 Attempt seeking to write EBML master sizes even if streamed 
Most EBML masters are much smaller than IO_BUFFER_SIZE and thus the size
can be updated. This makes parsing the resulting files easier.

Originally committed as revision 22197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 08:53:00 +00:00
Anton Khirnov
690b412657 matroskaenc: use "title" tag instead of "description" in track title. 
Patch by Anton Khirnov < whyskas at gmail >

Originally committed as revision 22187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 23:27:34 +00:00
Aurelien Jacobs
68b0fd7c68 matroskadec: cosmetic indentation 
Originally committed as revision 22185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 21:49:24 +00:00
Joakim Plate
3e93c8ed14 matroskadec: timestamps are dts and not pts in ms vfw compatibility mode 
original patch by elupus _at_ ecce _dot_ se

Originally committed as revision 22184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 21:46:43 +00:00
Martin Storsjö
b9b8ed2a02 Properly pad H.264 extradata when taken from fmtp SDP attributes 
This fixes some valgrind warnings.

Originally committed as revision 22182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 21:00:50 +00:00
Vitor Sessak
4b83fc0fe4 Plug memory leak in NUT muxer and demuxer 
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:31:24 +00:00
Jai Menon
1f6d0d42c5 Plug memory leak in NSV demuxer. 
Patch by Jai Menon.

Originally committed as revision 22173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:26:00 +00:00
Peter Ross
a27998010c Support demuxing of streamed Bink files 
Originally committed as revision 22166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 09:44:30 +00:00
Vitor Sessak
5eef7bcd09 Plug memory leak for truncated files 
Originally committed as revision 22154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-02 21:32:56 +00:00
Vitor Sessak
38beab19ab Plug some memory leaks for truncated files 
Originally committed as revision 22153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-02 21:32:29 +00:00
Vitor Sessak
8a4d067dfc Revert r22119 and partially revert 22120. 
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 18:16:10 +00:00
Anton Khirnov
e1c0b00b06 nutdec: make chapter start and length uint64_t to prevent overflows. 
Patch by Anton Khirnov wyskas chez gmail punto com

Originally committed as revision 22127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 07:26:41 +00:00
Reimar Döffinger
11a74f3639 Explicitly set struct addrinfo to NULL if getaddrinfo failed instead of 
assuming getaddrinfo will have done this.

Originally committed as revision 22123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 22:33:22 +00:00
Reimar Döffinger
a34fc5e23d Make our getaddrinfo implementation initialize "struct addrinfo" return 
value to NULL on errors.

Originally committed as revision 22122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 22:31:17 +00:00
Vitor Sessak
27dbc47c05 Plug some memory leaks in NUT muxer and demuxer 
Originally committed as revision 22120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 20:49:21 +00:00
Anton Khirnov
82f50f820e Print chapter info in dump_format(). 
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 18:37:09 +00:00
Michael Niedermayer
5692ed3ad4 Many mp3s seem to contain padding after id3 tags that is not considered in the 
tag size. Skip this to make the format probing quicker.

Originally committed as revision 22111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 16:40:17 +00:00
Martin Storsjö
f65919af7e Rename RTP depacketizer files from rtp_* to rtpdec_* 
Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 11:03:14 +00:00
Carl Eugen Hoyos
1e6365b305 Include rtpdec.h, it contains prototypes for the following functions: 
rtp_set_remote_url(), rtp_get_local_port(), rtp_get_file_handles()

Originally committed as revision 22107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 03:59:15 +00:00
Carl Eugen Hoyos
dda8fc6a09 Include avc.h from avc.c: It contains several prototypes. 
Originally committed as revision 22098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 02:04:34 +00:00
Carl Eugen Hoyos
998257bd4f Make mp4_read_descr static: It is only used inside libavformat/mov.c. 
Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 01:51:13 +00:00
Carl Eugen Hoyos
c53ffb2ce5 Include apetag.h which contains the prototype for ff_ape_parse_tag(). 
Originally committed as revision 22096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 01:43:47 +00:00
Martin Storsjö
50ff78db01 RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer 
This way, we avoid overwriting stream_index in the user's AVPacket
with a nonsense value.

Originally committed as revision 22081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 16:21:56 +00:00
Anton Khirnov
cba2f6d51b asfenc: write tags in proper UTF-16. 
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 16:59:55 +00:00
Anton Khirnov
a677078e14 asfenc: simplify writing of comment header. 
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 16:50:26 +00:00
Anton Khirnov
e4ea625ab0 asfdec: don't strip the "WM/" prefix, this should be done during conversion. 
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 16:38:23 +00:00
Benoit Fouet
a5517dcc9a asf: indent. 
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 09:10:37 +00:00
Benoit Fouet
9b54f4328e asf: add more entries to metadata conv table. 
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 09:09:39 +00:00
Anton Khirnov
fce4448948 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our 
metadata system.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:19:54 +00:00
Anton Khirnov
a106d4112d Don't add WM prefixes to all written ASF tags. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:17:32 +00:00
Anton Khirnov
531d8fa308 Eliminate put_str16(). 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:09:49 +00:00
Anton Khirnov
6164842300 Mention that metadata tags are (unvalidated) UTF-8. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:01:44 +00:00
Peter Ross
dd80be5bfc low-complexity Bink file seeking 
Originally committed as revision 22022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 11:43:33 +00:00
Peter Ross
7e276c85b1 set AVINDEX_KEYFRAME correctly for bink 
Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 11:30:38 +00:00
Yann Coupin
8d819221db Correctly increment continuity_counter in PCR packets. 
Patch by Yann Coupin, yann.coupin+ffmpeg gmail

Originally committed as revision 22020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 10:56:13 +00:00
Benoit Fouet
6538c0f1c6 asfdec: skip byte array tags. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:34:12 +00:00
Benoit Fouet
27e7492771 asfdec: add a debug message about skipped tags. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:33:18 +00:00
Benoit Fouet
47794b9d3e asfdec: fix a memleak. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:32:20 +00:00
Benoit Fouet
514b73cf0d asfdec: only unicode tags must have even length. 
Patch from: Anton Khirnov wyskas gmail

Originally committed as revision 22016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:31:03 +00:00
Anton Khirnov
43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer. 
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"

Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 06:27:12 +00:00
Michael Niedermayer
ab392695d5 Count all frames with codec_info_nb_frames not just ones with non zero 
duration. I hope this breaks nothing. Its needed for my fix of issue1156

Originally committed as revision 22001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:29:57 +00:00
Michael Niedermayer
6c6e6ef5e2 Put codec_info_nb_frames back in AVStream and print its value. 
This way streams with no or very few frames can be avoided during
auto selection

Originally committed as revision 21998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 15:07:18 +00:00
Peter Ross
02cd6f5426 Set video stream duration for Bink demuxer 
Originally committed as revision 21996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 11:15:18 +00:00
Martin Storsjö
9399393333 Cosmetics: reindent 
Originally committed as revision 21995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 11:05:36 +00:00
Peter Ross
b62c65f23e Bink audio pts starts at 0, not reported_size 
Originally committed as revision 21994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 11:01:51 +00:00
Kostya Shishkov
a45972a806 Make Bink demuxer pass video flags to decoder 
Originally committed as revision 21978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 06:36:26 +00:00
Ronald S. Bultje
3307e6ea86 Prefix non-static RTSP functions with ff_. 
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 00:35:50 +00:00
Michael Niedermayer
b7884740fa Make sure mp1/mp2 get their frame_size set. 
Fixes issue1696

Originally committed as revision 21972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 22:05:20 +00:00
Martin Storsjö
6f5a3d0a7b Add an RTSP muxer 
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 21:28:19 +00:00
Martin Storsjö
f86f665623 Free metadata in chained RTP muxers in the RTSP muxer 
This fixes a minor memory leak

Originally committed as revision 21970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 21:20:30 +00:00
Martin Storsjö
af037f8098 Cosmetics: reindent 
Originally committed as revision 21969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 19:47:22 +00:00
Martin Storsjö
15ba23150e Add declarations and doxygen documentation of generic rtsp support functions 
to rtsp.h, and make the functions non-static

Originally committed as revision 21968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 19:44:08 +00:00
Martin Storsjö
2efc97c2fe Cosmetics: reindent after applying patches 
Originally committed as revision 21967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 16:11:38 +00:00
Martin Storsjö
35cfd6464e Don't follow RTSP redirects when used as a muxer 
Originally committed as revision 21966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 15:57:40 +00:00
Martin Storsjö
3e24c7701c Add a function rtsp_setup_output_streams for announcing the SDP 
and setting up the internal RTSPStream data structures when using
the RTSP code in muxer mode.

Originally committed as revision 21965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 15:56:18 +00:00
Martin Storsjö
fd450a5177 Create AVFormatContext objects as private transport for output RTSP sessions 
Originally committed as revision 21964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 15:46:56 +00:00
Michael Niedermayer
0e5f33f242 Make sure a set r_frame_rate is not overriden by a guess. 
Also make sure we dont waste time in this case with collecting timestamps.

Originally committed as revision 21957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 10:19:46 +00:00
Michael Niedermayer
403c545d08 Attempt to fix the completely random values returned by ff_avc_find_startcode(). 
Originally committed as revision 21955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 00:34:27 +00:00
Vitor Sessak
044a950d82 Fix memory leak for truncated packets in idCin demuxer 
Originally committed as revision 21938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 14:41:39 +00:00
Michael Niedermayer
bbdf0d2214 Make sure we dont write more bytes into filename than the array is long. 
just a precaution in case the size of the source array is increased or
made dynamically allocateable.

Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 22:57:23 +00:00
Michael Niedermayer
6a2459059e Do not attempt to open references through absolute pathes. 
This would allow an attacker to test remotely if a local file exists.

Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 22:48:09 +00:00