virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
27,859 Commits 37 Branches 400 Tags 465 MiB
5e06b02005
Commit Graph

7010 Commits

Author SHA1 Message Date
Peter Ross
456a70aeb8 add ff_get_bmp_header 
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:23:44 +00:00
Michael Niedermayer
58ec7e00db Clarify AVFMT_TS_DISCONT and muxers. 
Originally committed as revision 26089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-25 19:49:15 +00:00
Martin Storsjö
8c579c1c60 rtsp: Require the transport reply from the server to match the request 
This fixes a crash if we requested TCP interleaved transport, but the
server replies with transport data for UDP. According to the RFC, the
server isn't allowed to respond with another transport type than the
one requested.

Originally committed as revision 26077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-23 15:05:24 +00:00
Martin Storsjö
81c8c18780 Makefile: Fix dependencies of components 
This fixes compilation with --disable-everything --enable-<component>,
for all encoders, decoders, muxers, demuxers, parsers, protocols, bsfs,
indevs, outdevs and filters at the moment. (All those that work without
any external dependencies at least.)

Originally committed as revision 26076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-22 20:00:42 +00:00
Martin Storsjö
1e0957cc6b Add a missing dependency for the WebM muxer 
This fixes one of the issues found if building with
--disable-everything --enable-muxer=webm

Originally committed as revision 26066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-21 09:23:35 +00:00
Martin Storsjö
9b14ec5fae sdp: Add a framesize attribute to H.263 SDP descriptions 
While not mentioned in RFC 4629, this is required for H.263 in
3GPP TS 26.234. It is in practice required for playback with
Android stagefright and on Samsung bada phones.

Originally committed as revision 26062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-20 20:46:40 +00:00
David Czech
9100d4d632 Fix crash if invalid bit-rate was read from file. 
Fixes issue 2426.

Patch by David Czech, davidczech510 gmail

Originally committed as revision 26061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-20 09:58:27 +00:00
Reimar Döffinger
bf09a01981 Change ASF demuxer to return incomplete last packets. 
Whether the behaviour for streams using scrambling makes sense
is unclear.

Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-18 13:18:52 +00:00
Zhentan Feng
c4e93eeecd Increase buffer size because the header itself can be larger than 8192 
(largest size according to spec: 64k). Fixes playback of
mmsh://a1635.v24937.c2493.g.vm.akamaistream.net/7/1635/2493/v0001/premrad.download.akamai.com/2493/premiere_rock_report/Country_Report.wma

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 26047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-17 21:17:40 +00:00
Martin Storsjö
bbd8f5477d rtsp: Don't set the RTP time base from the sample rate if no sample rate is set 
This also reverts SVN rev 26016, which incorrectly overwrote the time base
with 90 kHz for all streams, regardless of what was set by the SDP parsing.

The stream that triggered the fix in 26016 still works after this commit.

Originally committed as revision 26022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 21:06:25 +00:00
Luca Barbato
a4a3bade0a Reinstate default time_base for rtp streams 
The generic default is 0/0 and that obviously triggers once the value is used.

Originally committed as revision 26016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:16:37 +00:00
Thomas Guillem
1aa58c6405 tcp: Check url_interrupt_cb if connect was interrupted by a signal 
This makes it possible to abort a blocking connect call.

Patch by Thomas Guillem, thomas dot guillem at gmail

Originally committed as revision 26014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 23:03:05 +00:00
Justin Ruggles
80575c0e55 Add missing dependency for matroska muxer. 
Originally committed as revision 26005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 17:14:40 +00:00
Reimar Döffinger
4172951ba7 Return an error when get_buffer reads none or only partial data instead 
of returning packets with uninitialized data.
Returning partial packets as for other demuxers is problematice due to
packet scrambling and thus is not done.

Originally committed as revision 25931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:41:47 +00:00
Reimar Döffinger
3c3ef81b9b Ensure that packets returned from ASF demuxer are properly 0-padded. 
Originally committed as revision 25930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:39:08 +00:00
Reimar Döffinger
b72daad062 Remove hack in MP3 probe that was meant as a work-around for large 
ID3v2 tags which no longer works since ID3v2 handling was moved to
generic code.
In addition, in caused false-positives for all files starting with
one or more 0-bytes.

Originally committed as revision 25929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:34:50 +00:00
Anton Khirnov
a152c77f26 id3v2: skip data length indicator 
Originally committed as revision 25926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-10 15:48:56 +00:00
Kostya Shishkov
614e139a11 Don't try to demux WavPack files with >2 channels until we can support them 
Originally committed as revision 25919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 18:15:06 +00:00
Martin Storsjö
86b6e387cc rtsp/rtpdec: Set the AVStream time_base directly in rtsp when it is known 
This fixes cases where the RTP time base and the sample rate of the stream
differ. Previously, the AVStream time_base was unconditionally set to
the sample rate (which initially was set to one value when parsing the
rtpmap field in the SDP, but later overridden by an a=SampleRate field).

Additionally, this makes the code actually use the stream time base set
in rtpmap for video codecs, instead of hardcoding it to always be 90 kHz.

Originally committed as revision 25908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 13:29:44 +00:00
Martin Storsjö
bb776f3b00 rtsp: Parse RealRTSP sample rate declarations from the SDP 
The RTP time base can be different from the actual content sample rate.

Originally committed as revision 25907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 13:28:45 +00:00
Martin Storsjö
2eeefe205f rtpdec: Handle MP3 in RealRTSP 
This fixes playback of a RealRTSP/MP3 URL from the RTSP samples on
MultimediaWiki.

Originally committed as revision 25906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 13:28:13 +00:00
Anton Khirnov
407d3d5a3a id3v2: skip encrypted/compressed frames 
Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 07:52:54 +00:00
Anton Khirnov
7a07d158bd id3v2: use a named constant instead of 0x02 
Originally committed as revision 25902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 07:52:50 +00:00
Baptiste Coudurier
c6f1e29a15 In mov demuxer, read alac sample from extradata, fix #2406 
Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 01:38:26 +00:00
Martin Storsjö
86042de8a5 rtpdec_h264: Pass NAL type 0 through 
According to the spec, this type shouldn't ever be used. Nevertheless,
passing it through enables decoding streams which otherwise aren't
decodeable.

Originally committed as revision 25897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-06 12:44:09 +00:00
Martin Storsjö
4838cdab21 rtpdec: Skip padding bytes at the end of packets 
Originally committed as revision 25896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-06 12:43:38 +00:00
Martin Storsjö
28b4eb95bc rtpdec_qcelp: Use the depacketizer for static payload types, too 
Originally committed as revision 25894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:42:14 +00:00
Martin Storsjö
6a7e31a901 rtsp: Look for RTP payload handlers for static payload types, too 
Originally committed as revision 25893 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:41:44 +00:00
Martin Storsjö
003eb64217 rtsp: Factorize code for initializing the rtp payload handler 
Originally committed as revision 25892 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:41:09 +00:00
Martin Storsjö
1e515c4280 rtpdec: Add functions for finding depacketizers by name or payload id 
Originally committed as revision 25891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:39:50 +00:00
Martin Storsjö
2beb910d79 rtpdec: Allow dynamic payload handlers to handle static payload types, too 
Originally committed as revision 25890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:38:55 +00:00
Martin Storsjö
35014efcc6 rtpdec: Add a dynamic payload handler for the x-Purevoice format, RFC 2658 
This fixes roundup issue 2390.

Originally committed as revision 25889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:37:45 +00:00
Martin Storsjö
35b0169484 RTP/VP8: Update the warning about the VP8 payload 
The current implementation is incompatible with the latest spec drafts,
this should be communicated clearly to the user.

Originally committed as revision 25887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 11:45:57 +00:00
Aurelien Jacobs
118ccae030 add subtitle codec autodetection 
Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 14:46:13 +00:00
Aurelien Jacobs
5bdbf64cf3 set default subtitle_codec for ass muxer 
Originally committed as revision 25870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:47:12 +00:00
Aurelien Jacobs
908dc2a0b8 cosmetic: alignment 
Originally committed as revision 25869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:44:42 +00:00
Aurelien Jacobs
87d69d3232 use designated initializer in ASS (de)muxer 
Originally committed as revision 25868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:37:53 +00:00
Tomas Härdin
66be80d610 mpegtsenc: Improve PCR generation and output 
This fixes PCR drift due to accumulating TS_PACKET_SIZE*8*90000LL/ts->mux_rate each packet, due to rounding errors when mux_rate does not evenly divide 135360000.
This patch also increases the PCR precision to 27 MHz from 90 kHz and takes the location of the PCR data into account (+11 bytes according to the spec).

Originally committed as revision 25864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-03 13:26:42 +00:00
Stefan Gehrer
77b7c334be skip top-level objects to search for the simple index in ASF files 
Originally committed as revision 25863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-03 07:49:07 +00:00
Anton Khirnov
3694ac240b mpc: read id3v1 tags. 
Originally committed as revision 25860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-02 09:56:15 +00:00
Andrew Wason
3d305fd071 Add FourCC yuvs for rawvideo (PIX_FMT_YUYV422). 
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 23:15:51 +00:00
Aaron Colwell
365d8e471d Ensure that data_offset is set correctly when there are partial 
data packets before the first complete one.
Patch by Aaron Colwell [acolwell chromium org].

Originally committed as revision 25846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 19:02:28 +00:00
Anton Khirnov
82f19afefe Partially revert "Simplify code by using av_metadata_set2()." 
This reverts snprintf->av_d2str part of r20840.
With it, track number is exported as a float, which is not
desirable.

Originally committed as revision 25845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 16:38:12 +00:00
Martin Storsjö
4da71f18f6 rtpdec: Remove useless NULL initializations when using designated initializers 
Originally committed as revision 25844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 16:04:45 +00:00
Martin Storsjö
fe70a95e1d rtpdec: Change the qdm2, qt and svq3 depacketizers to use designated initializers 
Originally committed as revision 25843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 16:04:04 +00:00
Baptiste Coudurier
74f726209f In ts demuxer, if pes packet size is < ts packet, honor pes packet and skip padded data. 
Fixes issue #2392.

Originally committed as revision 25841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 03:43:56 +00:00
Martin Storsjö
0b6a7ff4b4 rtsp: Do a forgotten reindenting 
Originally committed as revision 25839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-28 21:17:39 +00:00
Peter Ross
e8ffb2fa4c Add G.722 to RIFF codec list 
Originally committed as revision 25837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-28 03:01:00 +00:00
Carl Eugen Hoyos
2400730fe7 Increase avformat micro version, forgotten in r25834. 
Originally committed as revision 25836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 20:29:54 +00:00
Carl Eugen Hoyos
25a08596d3 Add copyright notices for the E-AC3 and TrueHD parts of the muxer. 
Originally committed as revision 25835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 18:10:20 +00:00
Anssi Hannula
323e3f8b6c IEC 61937 encapsulation of TrueHD for HDMI passthrough. 
This works at least for some people testing it.

Patch by Anssi Hannula, anssi d hannula a iki fi

Originally committed as revision 25834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 18:08:01 +00:00
Reimar Döffinger
fe9d2edbdb DV: use data_offset to fix seeking in badly cut files where the first 
complete frame does not start at position 0.

Originally committed as revision 25833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 14:40:12 +00:00
Anatoly Nenashev
9d09ebf1ed Mobotix .mxg demuxer 
Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru

Originally committed as revision 25831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-26 10:11:16 +00:00
Baptiste Coudurier
adc7305424 In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069 
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 05:03:29 +00:00
Baptiste Coudurier
581ba2cee1 In av_find_stream_info, decode more h264 to get correct delay, issue #2020 
Originally committed as revision 25824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 02:19:03 +00:00
Stephen D'Angelo
c538eb51c6 In TS demuxer, create the AVStream during pmt parsing if the pes stream does not 
yet have it, this can happen if the pes stream contain data but no pes header
has been encoutered yet.
Patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 00:55:02 +00:00
Baptiste Coudurier
b795ff97e5 In TS demuxer, keep the pmt filter open to parse all pmt sections, 
based on patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 00:29:44 +00:00
Aurelien Jacobs
8ba5bf5a7c avidec: read some of the Nikon specific tags produced by Nikon cameras 
Originally committed as revision 25821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-24 20:53:27 +00:00
Aurelien Jacobs
73d0e33102 avidec: support non-standard creation_time format 
Originally committed as revision 25815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 12:04:50 +00:00
Aurelien Jacobs
d35cdd5719 avidec: trivial simplification regarding av_metadata_set 
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 12:03:23 +00:00
Anton Khirnov
eaa4542b64 matroskaenc: don't duplicate title information 
Title is already written into special fields designated for it --
per-segment Title, per-chapter ChapString and per-stream Name (yay for
consistent naming). Therefore, don't duplicate it in Tags.

Originally committed as revision 25813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 08:24:41 +00:00
Anton Khirnov
bcb5d217ba id3v2: add TDEN<->creation_time tag mapping 
Originally committed as revision 25812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 07:54:47 +00:00
Anton Khirnov
29c5c59013 lavf: document the new creation_time tag 
Originally committed as revision 25811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 07:54:44 +00:00
Baptiste Coudurier
8ee764b020 Remove some warnings 
Originally committed as revision 25808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 01:10:21 +00:00
Baptiste Coudurier
175272cb07 10l, fix memleak, forgot to free mp4_dec_config_descr 
Originally committed as revision 25807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 01:04:49 +00:00
Baptiste Coudurier
798c6facb7 In ts demuxer, support aac flexmux using extradata in iods, issue #2346 
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:51:12 +00:00
Baptiste Coudurier
91360ce61d Unset variable fps for mov and mp4 muxer, they support it 
but timestamps must start at 0 currently, and this causes sync
problem.

Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:41:28 +00:00
Anssi Hannula
3b39e2739f S/PDIF demuxer 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-22 22:09:26 +00:00
Aurelien Jacobs
7df2214328 movdec: export creation_date as metadata 
Originally committed as revision 25786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:02:52 +00:00
Aurelien Jacobs
933875a0f5 avidec: export creation_date as metadata 
Originally committed as revision 25785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:00:07 +00:00
Reimar Döffinger
fa8cc12650 Improve documentation wording. 
Originally committed as revision 25782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 11:33:26 +00:00
Reimar Döffinger
0f46d68522 Fix indentation. 
Originally committed as revision 25781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 11:07:04 +00:00
Reimar Döffinger
24ae353dfb WC3/xan: move palette handling to decoder, avoiding need for 
PaletteControl.
This also fixes playback of some files with ffplay (images were
corrupted for a short time after a palette change).

Originally committed as revision 25778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:32:23 +00:00
Reimar Döffinger
6bfc268305 Add av_append_packet function, to be used in code that merges packets 
to allow palette handling without using PaletteControl.

Originally committed as revision 25777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:24:48 +00:00
Reimar Döffinger
d9640a55ea Merge rotation into lookup table. 
Originally committed as revision 25774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-20 09:36:46 +00:00
Carl Eugen Hoyos
4b6bfbe2b7 100l: Fix crash in SPDIF muxer. 
Originally committed as revision 25762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-17 23:23:25 +00:00
Carl Eugen Hoyos
909865fdbe Add support for IEC 61937 ("SPDIF") encapsulation for E-AC-3. 
Only works via HDMI.

Patch by Anssi Hannula (anssi d hannula a iki d fi), based on some work
by myself.

Originally committed as revision 25760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-17 12:22:59 +00:00
Aurelien Jacobs
b3c0fc7673 av_find_stream_info(): set subtitle codec time_base 
Originally committed as revision 25758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-16 23:50:18 +00:00
Baptiste Coudurier
2b91d83ef3 In mov demuxer, export .mov encoder metadata tag 
Originally committed as revision 25757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-16 05:55:09 +00:00
Martin Storsjö
dd22cfb101 rtsp: Parse and use the Content-Base reply header, if present 
This fixes playing RTSP urls with query parameters.

Originally committed as revision 25755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-15 15:08:53 +00:00
Aurelien Jacobs
cb2c971d91 allow passing subtitles header between decoder and encoder 
Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-13 13:57:49 +00:00
Anton Khirnov
273231466c lavf/utils: use av_{i/o}format_next() instead of first_{i/o}format 
Originally committed as revision 25738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-13 08:55:15 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Anssi Hannula
8079d2ec08 Move code to be used by the IEC 61937 demuxer from spifenc.c into common 
files spdif.h and spdif.c.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-10 00:04:12 +00:00
Anssi Hannula
8cceef1681 Rename spdif.c as spdifenc,c to prepare for future spdif demuxer. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-09 23:57:02 +00:00
Yuriy Kaminskiy
c77549c510 rtsp: Set the real_setup pointer properly, avoid out of bounds memory accesses 
This fixes a regression since svn rev 24752, where the real_setup pointer
was set incorrectly. The arithmetic with the real_setup_cache pointer
is in units of enum AVDiscard, so the sizeof multiplication should be removed.

Patch by Yuriy Kaminskiy, yumkam at mail dot ru.

Originally committed as revision 25684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-06 23:26:49 +00:00
Ronald S. Bultje
37e9cc4ec7 Remove two instances of AVERROR(ff_neterrno()), because ff_neterrno() itself 
already does AVERROR().

Originally committed as revision 25671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 13:53:16 +00:00
Stefano Sabatini
ba7d6e798e Remove usage of deprecated libavcodec/audioconvert.h functions. 
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:19:34 +00:00
Thierry Foucu
caa7ad5dc6 Fix 16kHz Mono NellyMoser in flv. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 25667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:12:07 +00:00
Anton Khirnov
bf800c7db8 matroskadec: skip invalid tags with no TagName 
fixes segfault in issue 2328

Originally committed as revision 25659 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 06:29:04 +00:00
Mike Edenfield
7e35d8596b http: Handle 301/307 redirect requests, too 
Patch by Mike Edenfield, kutulu at kutulu dot org

Originally committed as revision 25651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 20:37:01 +00:00
Janne Grunau
915bfa33d1 mpegts: support LATM syntax 
Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 08:32:33 +00:00
Stefano Sabatini
267ff3aed1 Document url_write(). 
Originally committed as revision 25613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-31 16:11:56 +00:00
Martin Storsjö
0526c6f7c7 rtsp: Split out the RTSP demuxer functions to a separate, new file 
Originally committed as revision 25601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 08:43:57 +00:00
Martin Storsjö
c2688f3ac8 rtsp: Move rtsp_setup_output_streams into rtspenc.c 
Originally committed as revision 25600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 08:41:49 +00:00
Anton Khirnov
042ca05f0f vorbiscomment: convert metadata before computing the header's length 
Originally committed as revision 25586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-27 05:02:29 +00:00
Martin Storsjö
47bfe49c64 rtsp: Add stub declarations of the setup_in/output_streams functions 
This may be needed to avoid calls to implicitly defined functions
(that will be removed by dead code elimination later anyway).

Originally committed as revision 25585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-27 00:42:35 +00:00
Anton Khirnov
c55f891c2f nutdec: when parsing info packet, set metadata var only once 
Originally committed as revision 25558 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-24 07:28:04 +00:00
Aurelien Jacobs
a5cea13202 drop rtsp_default_protocols which is not part of public API and not used anymore 
Originally committed as revision 25557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:22:36 +00:00
Aurelien Jacobs
a178edf298 drop rtp_get_file_handles() which is not part of public API and not used anymore 
Originally committed as revision 25556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:21:49 +00:00
Aurelien Jacobs
fb660f4015 drop rtp_get_local_port() which is not part of public API and not used anymore 
Originally committed as revision 25555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:20:56 +00:00
Aurelien Jacobs
67f34aaa97 use rtp_get_local_rtp_port() instead of the deprecated rtp_get_local_port() 
Originally committed as revision 25554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:19:53 +00:00
Pascal Massimino
85f56757b4 cosmetics: align fields, and remove useless ones, in img2.c 
Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 22:07:00 +00:00
Martin Storsjö
eced8fa02e rtsp: Move the rtsp_probe function to the demuxer code block 
This function is only used by the RTSP demuxer.

Originally committed as revision 25537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:25:12 +00:00
Martin Storsjö
a66d44f0d2 Restore alphabetical order 
Originally committed as revision 25536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:19:14 +00:00
Martin Storsjö
44b70ce563 rtsp: Untangle the dependencies between the RTSP/SDP demuxers and RTSP muxer 
This allows compilation of one of them without requiring the others'
dependencies to be present.

Originally committed as revision 25535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:18:48 +00:00
Martin Storsjö
8bf0f96954 rtsp: Reorder functions 
Originally committed as revision 25534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:13:02 +00:00
Pascal Massimino
ac6d020ffa cleanup image2pipe_{de}muxer fields 
Originally committed as revision 25531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 00:57:53 +00:00
Martin Storsjö
095e5c0b6d sdp: Conditionally compile code using AF_INET6 
Should fix compilation in environments unaware of IPv6.

Originally committed as revision 25528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-19 07:50:40 +00:00
Martin Storsjö
44594cc798 Add a demuxer for receiving raw rtp:// URLs without an SDP description 
The demuxer inspects the payload type of a received RTP packet and
handles the cases where the content is fully described by the payload type.

Originally committed as revision 25527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-19 07:38:53 +00:00
Aurelien Jacobs
a3a29c2651 metadata: make av_metadata_set2 case insensitive by default 
Originally committed as revision 25515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 12:45:15 +00:00
Michael Niedermayer
94bdb1f80c Avoid negative SCR in mpeg ps muxer. 
Fixes a scr issue reported with dvdauthor ([FFmpeg-user] FFMPEG encoded MPEG-2 video causes error in DVDAuthor)

Originally committed as revision 25512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 21:31:31 +00:00
Anton Khirnov
ad7768f4c4 add ff_ prefix to metadata_conv() 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:20:41 +00:00
Anton Khirnov
d60a9f52eb lavf: simplify setting the encoder ident tag. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:07:20 +00:00
Martin Storsjö
fb66c31da4 Fix building, include the header instead of the source file 
Builds only seemed to have been broken in some configurations, though.

Originally committed as revision 25499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 08:50:50 +00:00
Baptiste Coudurier
96d1e75a0c In mov muxer, write artist metadata tag 
Originally committed as revision 25498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:23:47 +00:00
Baptiste Coudurier
edd33cb6fa In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name 
Originally committed as revision 25497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:16:11 +00:00
Martin Storsjö
946df0598b rtpdec: Return AVERROR(EAGAIN) for mpegts parsing errors 
This indicates that there was no error that needs to be reported to the
caller, so we can move on to parse the next packet immediately, if
available. The only error code that ff_mpegts_parse_packet can return
indicates that there was no packet to return from the provided data, for
which it returns -1.

Originally committed as revision 25496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 21:32:21 +00:00
Anton Khirnov
03700d399b Export metadata in the generic format. Deprecate old conversion API. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 19:04:25 +00:00
Aurelien Jacobs
ed09233fa2 cosmetic: alignment 
Originally committed as revision 25492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 18:30:43 +00:00
Aurelien Jacobs
13728334e8 add FF_API_SYMVER define to disable symver compatibility functions 
Originally committed as revision 25491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 18:25:01 +00:00
Aurelien Jacobs
114c9a5925 add FF_API_FIRST_FORMAT define to drop deprecated first_?format from public api 
Originally committed as revision 25489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:25:36 +00:00
Aurelien Jacobs
0139fdea08 add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id 
fields in AVFormatParameters

Originally committed as revision 25488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:19:01 +00:00
Aurelien Jacobs
d1742ff779 add FF_API_LAVF_UNUSED define to disable the unused struct fields 
Originally committed as revision 25487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:12:25 +00:00
Aurelien Jacobs
634e0304a8 add FF_API_READ_SEEK define to drop usage of AVInputFormat.read_seek 
and delay this transition to v54 as it is currently not functional

Originally committed as revision 25486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 13:39:15 +00:00
Aurelien Jacobs
d87a521cde add FF_API_PARSE_FRAME_PARAM define to disable the deprecated 
parse_image_size() and parse_frame_rate() public functions

Originally committed as revision 25485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 13:33:23 +00:00
Aurelien Jacobs
ade800c5b7 properly check for FF_API_URL_CLASS instead of LIBAVFORMAT_VERSION_MAJOR 
Originally committed as revision 25484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 13:09:35 +00:00
Aurelien Jacobs
ca51d86c96 add FF_API_ALLOC_FORMAT_CONTEXT define to disable the deprecated 
av_alloc_format_context() public function

Originally committed as revision 25483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:59:45 +00:00
Aurelien Jacobs
88e44314ea add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() function 
Originally committed as revision 25482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:54:12 +00:00
Aurelien Jacobs
8ef30ac1f3 add FF_API_UDP_GET_FILE define to disable the deprecated udp_get_file_handle() 
public function

Originally committed as revision 25481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:49:48 +00:00
Aurelien Jacobs
198ac67fe8 add FF_API_GUESS_FORMAT define to disable the deprecated guess_format() 
and guess_stream_format() public functions

Originally committed as revision 25480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:45:14 +00:00
Anton Khirnov
a15c7fd6cb Deprecate old API. 
Patch by Anton Khirnov, anton khirnov net

Originally committed as revision 25479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 09:41:20 +00:00
Anton Khirnov
81e5ff7ae2 vorbiscomment: change ff_vorbiscomment_write to take an AVMetadata** 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-14 19:08:31 +00:00
Martin Storsjö
54b2a4238c sapdec: Include sys/time.h for struct timeval 
This hopefully fixes compile errors on OS/2

Originally committed as revision 25466 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 11:09:06 +00:00
Martin Storsjö
01c8d258da Add a SAP demuxer 
Originally committed as revision 25463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 09:06:59 +00:00
Martin Storsjö
65cdee9c95 rtpdec: Don't use the no reordering codepath if there already is a queue 
Originally committed as revision 25462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:47:34 +00:00
Martin Storsjö
ddcf841191 rtpdec: Handle wrapping seq numbers in has_next_packet properly 
Originally committed as revision 25461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:15:39 +00:00
Martin Storsjö
d678a6fd82 rtpdec: Parse the next packet in the sequence if it is available, if the previous packet didn't return any data 
Originally committed as revision 25460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:14:30 +00:00
Martin Storsjö
91ec7aea20 rtpdec: Return AVERROR(EAGAIN) if out of data for mpegts, pass returned error codes through 
Originally committed as revision 25459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:13:53 +00:00
Martin Storsjö
f6e138b4f4 rtpdec: Don't call the depacketizer to return more data unless it actually said it has more data 
It may have returned a negative number for an error (e.g. AVERROR(EAGAIN),
if more data is required for it to be able to return a complete packet).

Originally committed as revision 25458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:13:07 +00:00
Martin Storsjö
4ffff36751 rtpdec: Split out storing of the depacketization return value to a separate function 
This makes the code less fragile and easier to understand.

Originally committed as revision 25457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:12:23 +00:00
Martin Storsjö
ad64a807a9 Add forgotten minor bump and changelog entry for the SAP muxer 
Originally committed as revision 25444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-11 11:50:33 +00:00
Alex Converse
d256d21e3f oggenc: Don't use char* to point to a string constant. 
Originally committed as revision 25440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 21:15:21 +00:00
Peter Ross
1e6f8d53fc cafdec: Handle ALAC extradata. 
This fixes roundup issue 2284.

Originally committed as revision 25430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 00:50:37 +00:00
Martin Storsjö
c689cccec9 libavformat: Always build id3v1.o and id3v2.o 
Functions from these files are referenced from utils.c now. This fixes
building with --disable-everything.

Originally committed as revision 25425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 14:58:46 +00:00
Martin Storsjö
1b40d4966c sapenc: Use the normal URL port as RTP port 
This makes the URL handling consistent - the URL hostname is used as
destination for the RTP packets, so the URL port should also belong to that.
Now the options announce_addr= and announce_port specify where the
announcements are sent.

Originally committed as revision 25424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 14:39:31 +00:00
Martin Storsjö
a1fc29f588 sapenc: Include os_support.h, to provide a fallback definition for socklen_t 
Originally committed as revision 25422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 09:16:40 +00:00
Aurelien Jacobs
fd0368e7ca move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation 
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 22:01:19 +00:00
Martin Storsjö
d1f676b8d4 Fix compilation on FreeBSD, use AF_UNSPEC instead of PF_UNSPEC 
Originally committed as revision 25416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 18:07:40 +00:00
Martin Storsjö
fcc7f40449 sapenc: Mark the muxer as depending on network functions 
Hide all code mentioning IPv6 behind HAVE_STRUCT_SOCKADDR_IN6.

Originally committed as revision 25415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 17:48:13 +00:00
Michael Niedermayer
d03b93e372 Add a space between the else and { in mpegenc.c in the line i added. 
Originally committed as revision 25414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 15:41:41 +00:00
Martin Storsjö
011071e717 Add a SAP (Session Announcement Protocol, RFC 2974) muxer 
Originally committed as revision 25413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 12:05:04 +00:00
Martin Storsjö
6898677e54 sdp: Only specify the TTL for IPv4 addresses 
According to RFC 4566, a TTL value must not be present for IPv6 multicast.

Originally committed as revision 25412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 11:58:47 +00:00
Martin Storsjö
a493f80a2c rtsp: Factorize out code for opening a chained RTP muxer 
The new object file is added to the SDP demuxer in the makefile, since it
is needed in both the RTSP muxer and demuxer and in the SDP demuxer, due
to the current code coupling.

Originally committed as revision 25410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:54:53 +00:00
Martin Storsjö
3d74223025 rtsp: Make rtsp_rtp_mux_open reusable 
Originally committed as revision 25409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:51:05 +00:00
Martin Storsjö
9e6acc7884 rtsp: Remove the start_time field from RTSPState, use AVFormatContext->start_time_realtime instead 
Originally committed as revision 25408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:50:29 +00:00
Martin Storsjö
25968c3953 Reindent 
Originally committed as revision 25406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:43:10 +00:00
Martin Storsjö
6766a354f7 udp: Add an option for connecting the udp socket 
This allows us to find out the local sending address via getsockname,
otherwise we just get INADDR_ANY (or similar for v6).

This also makes writes return ECONNREFUSED if nobody is listening on the
receiving port.

Originally committed as revision 25405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:42:30 +00:00
Martin Storsjö
b7952ed184 rtpdec: Set prev_ret properly when parsing more data from mpegts RTP packets 
Originally committed as revision 25404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:40:08 +00:00
Martin Storsjö
45658b7414 rtpdec: Store the previous return value for mpegts when it was -1, too 
Originally committed as revision 25403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 07:28:17 +00:00
Robert Schlabbach
243ac3fdaa rtpdec: Keep track of the previous return value from rtp_parse_packet_internal for mpegts packets 
Patch by Robert Schlabbach, robert_s at gmx dot net

Originally committed as revision 25402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 07:26:42 +00:00
Baptiste Coudurier
8a451afe7d In gxf muxer, round up number of lines mod 16 in mpeg umf data, based patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:41:04 +00:00
Baptiste Coudurier
c6d04addf6 In gxf muxer, fix number of flt entries based on patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:35:55 +00:00
Reuben Martin
82ae56b3fa In gxf muxer, write umf media for mpeg1video, patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:17:06 +00:00
Reuben Martin
ad4c3c6840 In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:15:35 +00:00
Aurelien Jacobs
e99179de9b remove useless local variable 
Originally committed as revision 25394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:10:51 +00:00
Aurelien Jacobs
3e4318bf4a remove useless local allocated start_time array 
Originally committed as revision 25393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:05:31 +00:00
Martin Storsjö
87b2b40a33 Reindent 
Originally committed as revision 25390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 08:00:03 +00:00
Martin Storsjö
10105c9b29 sdp: Don't require the explicit ?multicast option 
No such option is used anywhere else. Instead, detect the address type.

Originally committed as revision 25389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:59:35 +00:00
Martin Storsjö
55b6bd1c01 Convert ff_is_multicast_address to take a struct sockaddr parameter 
Not all users of this function will have a full struct sockaddr_storage
available, and casting other sockaddrs to sockaddr_storage is wrong,
while any sockaddr can be cast to a base sockaddr.

Originally committed as revision 25388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:58:56 +00:00
Martin Storsjö
7ac57fa5eb Share the is_multicast_address function 
The header probably isn't the right permanent place for this function, but
it is quite small, and consensus seems to be that it can stay in the
header for now, instead of creating a new file network.c just for this one.

Originally committed as revision 25387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:54:52 +00:00
Martin Storsjö
f63630cdf3 Move multicast address identification fallback macros to network.h from udp.c 
Originally committed as revision 25386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:53:31 +00:00
Michael Niedermayer
34b9e5bc4f Warn if muxing mpeg ps is attempted without a VBV buffer size. 
Originally committed as revision 25385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 01:57:39 +00:00
Michael Niedermayer
9b272e3274 Init SCR in mpeg muxer based on first DTS. 
This fixes issues if the first DTS is far away from 0.

Originally committed as revision 25383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 00:32:22 +00:00
Aurelien Jacobs
61138c43e0 properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR 
Originally committed as revision 25382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 21:43:46 +00:00
Aurelien Jacobs
38aab35f47 add new streams API without MAX_STREAMS limit 
(disabled until next major bump)

Originally committed as revision 25381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:56:14 +00:00
Aurelien Jacobs
feb2440c38 dynamically use nb_streams instead of static use of MAX_STREAMS 
Originally committed as revision 25380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:52:26 +00:00
Aurelien Jacobs
2899a28cdc document the fact that av_new_stream() can't be called in a background thread 
Originally committed as revision 25379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:49:25 +00:00
Reimar Döffinger
6612d8cf31 Move handling of ID3v2 to common utils.c code, reducing code duplication 
and supporting it for more formats, fixing issue 2258.

Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:21:07 +00:00
Stefano Sabatini
85c15960b4 Move the definitions of AVSEEK_SIZE to make it appear before the 
description of url_seek(), which references it.

Originally committed as revision 25376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 18:42:46 +00:00
Robert Schlabbach
9446b4bbbc rtpdec: Handle RTP header extension 
This fixes roundup issue 2270.

Patch by Robert Schlabbach, robert_s at gmx dot net

Originally committed as revision 25372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 16:59:14 +00:00
Martin Storsjö
3ece3e4c56 Add RTP depacketization of the X-QT QuickTime format 
Originally committed as revision 25371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 12:42:18 +00:00
Carl Eugen Hoyos
0ada32c373 Remove unused variable. 
Originally committed as revision 25369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:40:09 +00:00
Michael Niedermayer
fe5feaeb76 Use retry_transfer_wrapper() in url_write() as its callers do not expect it to stop in the middle. 
Originally committed as revision 25368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:18:43 +00:00
Michael Niedermayer
a46f7516ec Factor retry_transfer_wrapper() out of url_read_complete() 
Originally committed as revision 25367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:18:38 +00:00
Martin Storsjö
2f412421e8 movdec: Free the previous extradata 
If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.

Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:36:30 +00:00
Martin Storsjö
dc2cabd003 movdec: Split out ff_mov_read_stsd 
Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:35:44 +00:00
Anton Khirnov
ec4913a8ae vorbiscomment: add DISCNUMBER to the metadata conv table 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 20:11:07 +00:00
Martin Storsjö
5fe8021a6a rtsp/sdp: Move code into correct ifdefs 
This makes the code dependencies correct. Previously, the SDP demuxer
wasn't buildable on its own.

This also reverts rev 25343.

Originally committed as revision 25354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:46:25 +00:00
Martin Storsjö
eb99f179fa find_info_tag: Make sure the output buffer is null terminated 
Originally committed as revision 25353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:33:56 +00:00
Martin Storsjö
5961253463 udp: Define _DARWIN_C_SOURCE 
This is required in order to get the IP_MULTICAST_TTL define.

Originally committed as revision 25351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 16:35:33 +00:00
Martin Storsjö
25a2ebb917 udp: Return the actual error code on errors, instead of AVERROR(EIO) 
Originally committed as revision 25350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 14:09:30 +00:00
qrtt1
42f9582d8d Set proper error if server flags indicate that it doesn't support mmst. This 
prevents a read-after-close-induced segfault later. Fixes issue 2266.

Patch by qrtt1 <chingyichan dot tw gmail com>.

Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 14:04:46 +00:00
Tobias Bindhammer
2a26520a97 Cosmetics, lots of. 
Originally committed as revision 25348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 12:14:30 +00:00
Diego Biurrun
a44da176ac Remove some pointless CONFIG_RTSP_DEMUXER #ifdefs. 
They reside within a large CONFIG_RTSP_DEMUXER block and are thus pointless.

Originally committed as revision 25343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:06:32 +00:00
Diego Biurrun
2e802e3855 Add some #endif comments to ease understanding. 
Originally committed as revision 25342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:03:48 +00:00
Anton Khirnov
9b75309c19 matroskaenc: write metadata 
patch by Anton Khirnov   anton _at_ khirnov _dot_ net

Originally committed as revision 25341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 09:40:43 +00:00
Baptiste Coudurier
c9b8762856 xdcam hd422 720p24 fourcc in mov 
Originally committed as revision 25336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 20:23:36 +00:00
Aurelien Jacobs
0f02a7e2d2 mms: remove dependency on MAX_STREAM API 
Originally committed as revision 25335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 19:45:12 +00:00
Martin Storsjö
7fe3c270c0 rtpdec_svq3: Don't look for the unused RTP_FLAG_KEY flag 
Originally committed as revision 25327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 18:55:46 +00:00
Martin Storsjö
d7810f4541 rtsp: In the muxer, show the generated with verbose log level 
It is only useful for debugging, so it doesn't have to be shown every time.

Originally committed as revision 25323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:56:38 +00:00
Martin Storsjö
6ecd741713 rtsp: Show the received SDP 
Originally committed as revision 25322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:55:16 +00:00
Benjamin Larsson
62784e3733 Add the CODEC_CAP_CHANNEL_CONF capability code and add 
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 22:18:02 +00:00
Martin Storsjö
ae8c28db87 applehttp: Add comments to make_absolute_url 
Originally committed as revision 25319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:59:16 +00:00
Martin Storsjö
9d229ef9e6 applehttp: Handle a .. path segment in the base url 
Originally committed as revision 25318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:58:36 +00:00
Martin Storsjö
978a5ce82e Reindent 
Originally committed as revision 25317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:58:13 +00:00
Martin Storsjö
8f7c2452de applehttp: Allow the base url to be a local file name, too 
Originally committed as revision 25316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:57:58 +00:00
Stefano Sabatini
8bf256bcc0 Document url_get_filename(). 
Originally committed as revision 25310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 09:16:52 +00:00
Aurelien Jacobs
dba249abee ffmpeg: add a grow_array() helper function 
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:29:37 +00:00
Martin Storsjö
321259c1ab rtsp: Return a queued packet if it has been in the queue for longer than max_delay 
Originally committed as revision 25295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:52:26 +00:00
Martin Storsjö
58ee09911e rtpdec: Reorder received RTP packets according to the seq number 
Reordering is enabled only when receiving over UDP.

Originally committed as revision 25294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:50:24 +00:00
Martin Storsjö
0260741876 rtpdec: Split out the part of rtp_parse_packet that does the parsing of new packets 
Originally committed as revision 25293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:46:10 +00:00
Reimar Döffinger
27af8902c4 Fix indentation of ff_id3v2_read 
Originally committed as revision 25292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:45:18 +00:00
Martin Storsjö
c690fa97e5 Reindent/rewrap 
Originally committed as revision 25291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:53 +00:00
Martin Storsjö
38f8c80b62 rtsp: Reorganize if statements in rtsp_read_play 
Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:18 +00:00
Martin Storsjö
ad4ad27fb6 rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer 
Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

Originally committed as revision 25289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:43:27 +00:00
Martin Storsjö
96a7c9753e rtsp: Use a dynamically allocated receive buffer 
Originally committed as revision 25288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:41:31 +00:00
Tomas Härdin
8878e3b21b Add demuxer for LXF (Leitch/Harris' VR native stream format) 
Originally committed as revision 25281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 11:08:24 +00:00
Baptiste Coudurier
d8e456400e Correct tag is m2v1 
Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 18:12:27 +00:00
Stefano Sabatini
f3f5eb6e70 Document url_filesize(). 
Originally committed as revision 25268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 10:55:08 +00:00
Stefano Sabatini
0a216bd1dd Make register_protocol() use the function av_register_protocol2() 
rather than av_register_protocol(), which is deprecated.
Fix the GCC warning:
avio.c: In function ‘register_protocol’:
avio.c:93: warning: ‘av_register_protocol’ is deprecated (declared at avio.c:86)

Originally committed as revision 25267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 10:51:22 +00:00
Baptiste Coudurier
826481ea91 Remove duplicate entries 
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 21:35:52 +00:00
Baptiste Coudurier
3432c26319 Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx 
Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 21:34:31 +00:00
Ronald S. Bultje
3dedbeff7b Check return value of get_chunk_header(). Since enum can be unsigned, the 
current code wouldn't always error out on errors.

Based on patch by Stephen d'Angelo <sdangelo evertz com>.

Originally committed as revision 25260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 15:43:36 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3 
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 00:33:21 +00:00
Michael Chinen
59cb40b921 Fix index_entries pos: 
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 22:17:58 +00:00
Martin Storsjö
4a94cfea02 rtpproto: Use a sockaddr_storage instead of a sockaddr_in with recvfrom 
Originally committed as revision 25224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 16:10:23 +00:00
Tomas Härdin
1620939022 mpegtsenc: Indent 
Originally committed as revision 25222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 12:27:26 +00:00
Tomas Härdin
d1ac03517e mpegtsenc: Write subtitle extradata if set 
Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 12:27:23 +00:00
Michael Niedermayer
6ed040408b Move AVOptions from libavcodec to libavutil 
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 14:25:22 +00:00
Kostya Shishkov
cba322d76d Make WMV3 decoder attempt to decode WMVP as well 
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 13:56:50 +00:00
Stefano Sabatini
b9f9e59afc Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the 
corresponding AVMEDIA_TYPE_* symbols.

Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-25 23:27:16 +00:00
Martin Storsjö
6df4029549 Add an AVOption max_delay for AVFormatContext->max_delay 
This can currently also be set via -muxdelay in ffmpeg for muxers,
but not for demuxers (nor for demuxers in ffplay) - this patch
allows it to be set in all those cases.

Originally committed as revision 25180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 18:04:21 +00:00
Carl Eugen Hoyos
b7d56a17ae Fix indentation after r25158. 
Originally committed as revision 25160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 09:53:26 +00:00
Richard Buteau
6ac6e3d123 Fix aspect ratio for files that have it stored in 
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

Originally committed as revision 25158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 03:40:06 +00:00
Diego Biurrun
26d5112c57 cosmetics: Place concat protocol entry in alphabetical order. 
Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-21 22:21:12 +00:00
Martin Storsjö
b416267622 tcp: Check both wfds and efds when waiting for the result from connect 
On windows, a connection failure doesn't trigger wfds as it does on unix.

This fixes issue 2237, based on code by yeyingxian.

Originally committed as revision 25154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-21 20:17:34 +00:00
Martin Storsjö
63206a8ffb Check for the IPPROTO_IPV6 define before using it 
This fixes building on FreeBSD in some configurations, if the IPv6 multicast
structs are available, but IPPROTO_IPV6 isn't defined.

Originally committed as revision 25147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 06:38:40 +00:00
Martin Storsjö
160918d588 rtsp: Handle standard assigned codec names for private payload types, too 
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:39:25 +00:00
Martin Storsjö
0048a2a8d3 Handle G.722 in RTP, and all the exceptions mandated in RFC 3551 
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:35:39 +00:00
Michael Niedermayer
4faf628f20 Clarify what av_read_frame() returns. 
Originally committed as revision 25123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-14 22:20:46 +00:00
Zhou Zongyi
4383692896 Add R10k decoder. 
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-13 22:08:51 +00:00
David Byron
0c41d554e2 Read all id3v2 tags at the beginning of mp3 files. 
Patch by David Byron, dbyron dbyron com

Originally committed as revision 25105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-11 16:29:23 +00:00
Tomás Touceda
16f825085a FLV Metadata 
Patch by Tomás Touceda, chiiph gentoo org

Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 23:29:07 +00:00
Måns Rullgård
324d22b2b4 nutenc: fix unstable floating-point calculations 
Originally committed as revision 25095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 13:16:08 +00:00
Alex Converse
20de72a447 adts demuxer: Set the time base to be the LCM of all ADTS sample rates. 
Originally committed as revision 25091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 23:15:17 +00:00
Martin Storsjö
9013560f13 Add a muxer and demuxer for raw G.722 
Originally committed as revision 25087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 19:27:41 +00:00
Baptiste Coudurier
6bd296f1e4 In mov muxer, write reduced sample aspect ratio values in pasp 
Originally committed as revision 25082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:22:02 +00:00
Baptiste Coudurier
0e7d436d92 Check dref size based on a patch by google 
Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:20:24 +00:00
Baptiste Coudurier
9044dd8399 In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539 
Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:18:14 +00:00
Christian d'Heureuse
b163078fe3 Fix formatting for negative start times (issue 2139). 
Patch by Christian d'Heureuse, chdh inventec ch

Originally committed as revision 25063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 21:06:21 +00:00
Justin Ruggles
bdecdd2bfc Read the number of channels from the 'dac3' tag for AC-3 in MP4. 
Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-06 21:52:11 +00:00
Reimar Döffinger
1b4d327b1c Add a special function to mkv demxuer to parse length values that includes 
special-case code to handle all possible encodings of "unknown length".

Originally committed as revision 25049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-06 17:51:44 +00:00
Aurelien Jacobs
b004207df4 move stream info arrays into a struct to ease future dynamic allocation 
Originally committed as revision 25045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-05 22:25:45 +00:00
Aurelien Jacobs
4a194c8f47 matroskadec: allow uint and float elements with length = 0 
Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-05 21:37:40 +00:00
Ronald S. Bultje
f0d8ac529f Move INET6_ADDRSTRLEN to network.h, similar to other network-related fixups 
for broken OSes. This is included in rtsp.h, as opposed to os_support.h.
Should fix OS/2 broken build on fate.

Originally committed as revision 25035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 20:06:01 +00:00
James Darnley
521d434fd5 Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>. 
Fixes issue 555.

Originally committed as revision 25034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:30:27 +00:00
Ronald S. Bultje
7bac991fd9 Reindent after r25032. 
Originally committed as revision 25033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:26:27 +00:00
John Wimer
619298a84d Send NAT punching messages to the address specified in the Transport: 
message, if available (RFC 2326, section 12.39), fixes issue 2212.

Patch by John Wimer <john at god vtic net>.

Originally committed as revision 25032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:25:59 +00:00
Martin Storsjö
8bb90c5394 Set frame_size in the amr demuxer 
Originally committed as revision 25030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 14:59:18 +00:00
Martin Storsjö
744a882f6c rtsp: 10l, try to update the correct rtp stream 
This fixes a bug from rev 22917. Now RTSP streams where the individual RTCP
sender reports aren't sent at the same time actually are synced properly.

Originally committed as revision 25029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 07:10:21 +00:00
Reimar Döffinger
ff6a5fc1f0 Optimize/simplify ebml_read_num. 
Originally committed as revision 25026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 19:17:46 +00:00
Carl Eugen Hoyos
2b50c4f6cc Cosmetics: Reindent after r25023. 
Originally committed as revision 25024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 11:53:09 +00:00
Andrew Wason
4ed899f2c5 Fix crash when decoding DV in AVI introduced in r24579 (issue 2174). 
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 11:51:32 +00:00
Baptiste Coudurier
e66f8a5389 cosmetics: spaces between and after parentheses 
Originally committed as revision 25021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-01 22:58:39 +00:00
Baptiste Coudurier
eeeae2bf05 gxf muxer only accepts pal or ntsc resolutions currently, so fail if resolution is something else 
Originally committed as revision 25014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-01 00:04:47 +00:00
Tobias Bindhammer
8731c86d03 Solving memory leak and initialization problem with prev_pkt / pkt. 
Originally committed as revision 25004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-31 07:15:11 +00:00
Aurelien Jacobs
4ca31edcfe split raw.c into rawdec.c and rawenc.c 
Originally committed as revision 24997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 23:16:35 +00:00
Aurelien Jacobs
92aa28d292 move raw video demuxer to its own file 
Originally committed as revision 24996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 22:53:16 +00:00
Aurelien Jacobs
f1714d5846 move pcm muxers to their own file 
Originally committed as revision 24995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 22:42:25 +00:00
Aurelien Jacobs
e94204dfd8 move pcm demuxers to their own file 
Originally committed as revision 24993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 21:17:34 +00:00
Ben Littler
f0feb4d72f add WAWV fourcc, works on V-codecs/WAWV.avi 
Originally committed as revision 24991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 16:43:33 +00:00
Aurelien Jacobs
4bc16e83a7 simplify code by using the AV_NE() macro 
Originally committed as revision 24986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:21:29 +00:00
Aurelien Jacobs
8f3890404c move null muxer to its own file 
Originally committed as revision 24985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:15:50 +00:00
Aurelien Jacobs
1ac301cad8 cleanup includes which are not used anymore in raw.c 
Originally committed as revision 24984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:06:48 +00:00
Aurelien Jacobs
9e0d82418b move ac3/eac3 demuxer to its own file 
Originally committed as revision 24983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:02:47 +00:00
Aurelien Jacobs
66e35c5fc6 move dnxhd demuxer to its own file 
Originally committed as revision 24982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:51:47 +00:00
Aurelien Jacobs
170a250f7d move dirac demuxer to its own file 
Originally committed as revision 24981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:44:26 +00:00
Aurelien Jacobs
99392a6111 move h261 demuxer to its own file 
Originally committed as revision 24980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:37:37 +00:00
Aurelien Jacobs
b30593c7db move h263 demuxer to its own file 
Originally committed as revision 24979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:34:18 +00:00
Aurelien Jacobs
9243ed3f91 move h264 demuxer to its own file 
Originally committed as revision 24978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:28:51 +00:00
Aurelien Jacobs
187186c600 cosmetic 
Originally committed as revision 24977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:23:52 +00:00
Aurelien Jacobs
e35070582e move m4v demuxer to its own file 
Originally committed as revision 24976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:23:30 +00:00
Aurelien Jacobs
c3ed4b2d38 move cavsvideo demuxer to its own file 
Originally committed as revision 24975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:14:55 +00:00
Aurelien Jacobs
8c51530fa1 move mpegvideo demuxer to its own file 
Originally committed as revision 24974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 20:36:23 +00:00
Aurelien Jacobs
b47a5a954a move ingenient demuxer to its own file 
Originally committed as revision 24973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 19:16:04 +00:00
Aurelien Jacobs
6d0678d182 move DTS demuxer to its own file 
Originally committed as revision 24972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 19:00:40 +00:00
Aurelien Jacobs
85a2aada90 simplify code by using the AV_NE() macro 
Originally committed as revision 24971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 18:33:39 +00:00
Aurelien Jacobs
26aa681111 10l: aacdec and idroqenc still depend on raw.o 
Originally committed as revision 24970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 18:28:03 +00:00
Aurelien Jacobs
2aa751d2c8 rename idroq.c to idroqdec.c 
Originally committed as revision 24969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 16:37:33 +00:00
Aurelien Jacobs
54a73bb57f move id roq muxer to its own file 
Originally committed as revision 24968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 16:35:44 +00:00
Aurelien Jacobs
49824cb66a move ADTS AAC demuxer to its own file 
Originally committed as revision 24967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 16:18:20 +00:00
Josh Allmann
b20359f51a rtsp: Return AVERROR_EOF when all streams have received an RTCP BYE packet 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:25:16 +00:00
Josh Allmann
682d28a965 Reindent 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:20:18 +00:00
Josh Allmann
ff328c0225 rtpdec: Read RTCP compound packets 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:19:44 +00:00
Josh Allmann
a1ba71aace rtsp: Check the RTCP file handle for new packets, too 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:16:54 +00:00
Ronald S. Bultje
6a1712ddb5 Fix two compiler arnings related to printf-format of sizeof()-statements. 
Originally committed as revision 24961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-28 23:56:56 +00:00
Zhentan Feng
37c506e8b9 stream_selection can be freed in the fail case, in which case it's unassigned. 
Therefore, init it with NULL to prevent a crash on invalid streams.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-28 23:55:26 +00:00
Tobias Bindhammer
133cc989dd Cosmetic changes. 
Originally committed as revision 24944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 10:03:14 +00:00
Tobias Bindhammer
2fdb2b5438 Insert info from extradata into header 
Originally committed as revision 24943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 10:03:11 +00:00
Tobias Bindhammer
9e906bb1bf Added option to write frames interleaved (yet disabled) 
For this reason, a MuxerContext and write_trailer()-function was added,
to track the previous packet and flush the last packet at the end.

Originally committed as revision 24942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 10:03:09 +00:00
Andreas Öman
f06d6c751f Make stub version of ff_sdp_write_media() match its prototype 
Used when compiled without CONFIG_RTP_MUXER

Fallout from r24915

Originally committed as revision 24935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 21:07:04 +00:00
Josh Allmann
186f1ec5f4 Add rtp_get_rtcp_file_handle function 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 17:32:59 +00:00
Martin Storsjö
7934b15d5a Handle IPv6 in the RTSP code 
Originally committed as revision 24925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 15:32:29 +00:00
Martin Storsjö
3fbd12d109 Handle IPv6 in the SDP demuxer 
Originally committed as revision 24924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 15:32:00 +00:00
Martin Storsjö
2401660d2f rtsp: Return EOF if the TCP control channel is closed 
Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:42:17 +00:00
Martin Storsjö
5a8693ef59 Reindent 
Originally committed as revision 24919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:31:33 +00:00
Martin Storsjö
7ad526d288 Simplify resolve_destination in sdp.c further, now that we don't enforce IPv4 any longer 
Originally committed as revision 24918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:30:06 +00:00
Martin Storsjö
1272ae7e50 10l, add new function parameters to resolve_destination for !config_network too 
Originally committed as revision 24917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 12:51:20 +00:00
Martin Storsjö
cc83027c67 Reindent, rewrap lines 
Originally committed as revision 24916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 12:34:42 +00:00
Martin Storsjö
7ad1dc5447 Properly handle IPv6 addresses in the SDP generation 
Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 12:29:32 +00:00
Josh Allmann
7f3468d392 rtp: Replace hardcoded RTCP packet types with defines 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 09:15:31 +00:00
Måns Rullgård
668338c573 avformat: free decryption key in av_close_input_stream() 
Originally committed as revision 24899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:08:53 +00:00
Tobias Bindhammer
bb07ab7cf2 fixed some return values and deprecated CODEC_TYPE_VIDEO. 
dithering (faster) along a linear gradient now.

Originally committed as revision 24898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 14:02:31 +00:00
Måns Rullgård
ac9c19da66 asfcrypt: fix unaligned accesses with armcc 
Compilers may assume a pointer has natural alignment, even if it was
assigned from a pointer type with weaker alignment requirements.  It
is thus not safe to assign a possibly unaligned value to a pointer,
regardless of how it is subsequently dereferenced.

Originally committed as revision 24897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 13:42:28 +00:00
Måns Rullgård
e955bf3b42 asfcrypt: fix unaligned read in ff_asfcrypt_dec() 
Originally committed as revision 24886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 15:38:57 +00:00
Luca Abeni
952139a322 Do not use the server SSRC as client SSRC in the RTP demuxer 
Originally committed as revision 24879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 11:53:27 +00:00
Tobias Bindhammer
b7cf4e4f55 enabling codec and muxer by registering it in allcodec.c and allformat.c and adding files to the build-system 
Originally committed as revision 24878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 11:52:34 +00:00
Tobias Bindhammer
901694f160 Corresponding muxer for the a64 codec 
Originally committed as revision 24875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 11:47:50 +00:00
Ronald S. Bultje
f5ea69b235 MMSH support, the most popular and widely used of all MMS variants. Written by 
Zhentan Feng <spyfeng gmail com> as part of Google's Summer of Code program.

Originally committed as revision 24861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-21 19:04:41 +00:00
Aurelien Jacobs
364cacc7c7 add FF_API_URL_RESETBUF define to disable the deprecated url_resetbuf() 
public function

Originally committed as revision 24841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 21:28:43 +00:00
Aurelien Jacobs
838b27b42c add FF_API_REGISTER_PROTOCOL define to disable the deprecated 
register_protocol() function

Originally committed as revision 24840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 21:21:32 +00:00
Måns Rullgård
b2125520e7 applehttp: define _XOPEN_SOURCE=600 as required for usleep() 
Originally committed as revision 24839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 17:07:12 +00:00
Aurelien Jacobs
404eba44b1 add FF_API_URL_CLASS define to enable usage of URLContext as a AVClass 
Originally committed as revision 24835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 16:49:08 +00:00
Martin Storsjö
cd223e0b4e Add Apple HTTP Live Streaming demuxer 
Originally committed as revision 24834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:54:37 +00:00
Martin Storsjö
e55ebcc3f6 Move the definition of the maximum url size for static buffers to internal.h 
Originally committed as revision 24833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:50:40 +00:00
Martin Storsjö
f9c399c4fd Make parse_key_value from httpauth a common lavf internal function 
Originally committed as revision 24832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:49:53 +00:00
Aurelien Jacobs
25ae798c87 add a comment to clarify that FF_API_* defines are not part of public API 
Originally committed as revision 24826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 20:37:32 +00:00
Aurelien Jacobs
54036be11a rename LAVF_API_* defines to FF_API_* to clarify that it is not public API 
Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 20:34:31 +00:00
Alexander Kojevnikov
18bbe9df9a Support unsynchronisation for id3v2 tags. 
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 16:29:46 +00:00
Thierry Foucu
df4f1d5108 Add AVC EOS tag to H264-encoded FLV files. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 24820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 09:39:21 +00:00
Aurelien Jacobs
dd872bf49f add LAVF_API_OLD_METADATA define to disable the deprecated metadata API 
Originally committed as revision 24818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 20:23:19 +00:00
Aurelien Jacobs
072e3efd1b add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API 
Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 19:30:21 +00:00
Aurelien Jacobs
e110e968fe matroskadec: minor simplification 
patch from reimar

Originally committed as revision 24804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 14:25:14 +00:00
Aurelien Jacobs
4f90688b6e matroskadec: fix integer overflow 
patch from reimar

Originally committed as revision 24803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 14:05:23 +00:00
Josh Allmann
51291e6005 Add RTP depacketization of VP8 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-16 14:23:35 +00:00
Josh Allmann
7b18d94cb3 Add RTP packetization of VP8 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-16 14:21:17 +00:00
Ronald S. Bultje
63638a3c4a Print error messages in case of connection failure or name resolution failure 
in tcp.c.

Originally committed as revision 24796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-14 20:34:51 +00:00
Ronald S. Bultje
afbc4d2dac Prevent overflow on random input. 
Originally committed as revision 24795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 20:06:18 +00:00
Ronald S. Bultje
67197656d1 Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamically 
allocate the array.

Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:30:01 +00:00
Zhentan Feng
c46000c1ff Set fixed chunksize for ASF header in MMS streams, as per MSDN documentation. 
This fixes playback of at least one MMST stream.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:08:57 +00:00
Zhentan Feng
99ab8ff049 Fix wrong command prefix for timing test in MMST protocol. 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:02:37 +00:00
Martin Storsjö
1ddc176ec4 Add RTP depacketization of MP4A-LATM 
Originally committed as revision 24790 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 21:07:17 +00:00
Ronald S. Bultje
27014bf5a3 Send OPTIONS request at a regular basis to standard RTSP servers as well, 
this prevents a time-out which closes the TCP connection and kills our
session.

see "Re: [FFmpeg-devel] [PATCH] rtsp.c: keep-alive" thread on mailinglist.

Originally committed as revision 24785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 13:39:38 +00:00
Ronald S. Bultje
d68776d54f Add another missing file from r24799. 
Originally committed as revision 24784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 02:01:33 +00:00
Baptiste Coudurier
d2064fd42b Fix segv when stream copy and validate_tag fails, st->codec->codec is not set 
Originally committed as revision 24782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 00:35:19 +00:00
Ronald S. Bultje
6ef14e5753 Add missing mms.c from r24779. 
Originally committed as revision 24780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 23:45:05 +00:00
Zhentan Feng
fcd11c61ea Move functions and structs shared between MMSH and MMST into their own file, 
mms.c. Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 22:50:17 +00:00
Zhentan Feng
edce93536a Extract fields that are to be shared between MMST/MMSH into a common struct, 
MMSContext. The other MMST-specific members go into MMSTContext.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 22:43:54 +00:00
Ronald S. Bultje
a46cd6e141 Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet. 
Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 22:27:29 +00:00