Commit Graph

3198 Commits

Author SHA1 Message Date
Ronald S. Bultje
8a8754d80f Allow cycling between different protocols (TCP, UDP or multicast) so that if
one doesn't work, we can try the next one (i.e. trial-error protocol auto-
probing).

Discussed and approved in "[PATCH] RTSP alternate protocol 2-3/3".

Originally committed as revision 12504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:05:08 +00:00
Ramiro Polla
0f3444e17c MSN TCP Webcam stream demuxer.
Originally committed as revision 12492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-18 19:54:47 +00:00
Ronald S. Bultje
53620bba51 Split the SETUP request into a separate function, as a prelude into allowing
multiple SETUPs to be send to cycle protocols rather than bailing if one
fails.

Discussed and approved in "[PATCH] RTSP alternate protocol 1/3".

Originally committed as revision 12476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-17 12:16:39 +00:00
Baptiste Coudurier
8c2a207019 just skip klv packet, when no corresponding stream is found
Originally committed as revision 12464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 17:54:36 +00:00
Baptiste Coudurier
23f0861715 simplify, flags is 24bits according to specs
Originally committed as revision 12460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 15:13:40 +00:00
Baptiste Coudurier
558ce5c490 fucked up alphabetical order again, sorry
Originally committed as revision 12459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 13:40:21 +00:00
Baptiste Coudurier
aa9f4208b6 ipod/iphone compatible mp4 muxer
Originally committed as revision 12458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 13:36:36 +00:00
Diego Biurrun
bd10713636 typo fixes
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 16:15:47 +00:00
Baptiste Coudurier
4e9b8211b0 useless null
Originally committed as revision 12441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 13:10:49 +00:00
Baptiste Coudurier
82213f68ba remove useless img_write_trailer func
Originally committed as revision 12440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 12:48:13 +00:00
Diego Biurrun
2cab640129 typo fixes
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 23:58:46 +00:00
Aurelien Jacobs
074ac3c2d0 add out of bound stream index checks
fix issue379

Originally committed as revision 12417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:23:06 +00:00
Aurelien Jacobs
6ed4eec550 add a temporary variable to simplify the code
Originally committed as revision 12415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:09:27 +00:00
Björn Axelsson
5acef35f57 Add AVClass to URLContext at next major version bump
Patch by Björn Axelsson (bjorn axelsson intinor se)

Originally committed as revision 12411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 19:03:39 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 18:42:09 +00:00
Aurelien Jacobs
b847847a0c cosmetics: remove some empty lines
Originally committed as revision 12404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 00:48:36 +00:00
Aurelien Jacobs
01ccf45b92 remove useless and misleading comments
Originally committed as revision 12403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 00:45:25 +00:00
Aurelien Jacobs
36b0782e71 consistent use of MKTAG() in the codec_bmp_tags table
Originally committed as revision 12401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:43:55 +00:00
Aurelien Jacobs
ab0b2e559a cosmetics: alignment of the codec_bmp_tags table
Originally committed as revision 12400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:34:14 +00:00
Mike Melanson
d98878f423 recognize the CLJR FourCC (Cirrus Logic AccuPak)
Originally committed as revision 12391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 04:18:48 +00:00
Ramiro Polla
ffa71b2bbb Typo + grammar
Originally committed as revision 12385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 22:43:13 +00:00
Ramiro Polla
ab8ab30c3d Introduce max_picture_buffer variable in AVFormatContext,
set by rtbufsize option.

Originally committed as revision 12383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 21:59:11 +00:00
Ramiro Polla
54b6249681 Define WIN32_LEAN_AND_MEAN before including windows.h to exclude
rarely-used header files.

Originally committed as revision 12378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 19:00:55 +00:00
Ramiro Polla
a06ba2a18d Include windows.h instead of trying to redeclare Sleep
os_support.h used to be included in all lavf files, and including windows.h
here caused a significant slowdown.

Originally committed as revision 12377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 18:59:45 +00:00
Ramiro Polla
409e1d71ea Put network-related code under #ifdef
Originally committed as revision 12372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:43:53 +00:00
Ramiro Polla
591cf1170b Group network-related code together
Originally committed as revision 12371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:43:10 +00:00
Diego Biurrun
9b25f4a65f cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 14:39:43 +00:00
Ramiro Polla
5dea940937 __stdcall -> WINAPI
Windows x64 has no __stdcall.
It is not yet supported, but someday it might...

Originally committed as revision 12363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:47:44 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:17 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:25:09 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 20:44:44 +00:00
Baptiste Coudurier
4c7981ba7c do not reset duration_error for all streams, only reset current stream, fix wrong_fps.gxf
Originally committed as revision 12353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 17:44:42 +00:00
Baptiste Coudurier
72d334cab4 support AVDISCARD_ALL
Originally committed as revision 12350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 13:40:29 +00:00
Michael Niedermayer
11c55efa34 Skip over unknown extended_content_header tags.
fixes issue358

Originally committed as revision 12347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:26:48 +00:00
Michael Niedermayer
16428e6348 simplify
Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:20:49 +00:00
Diego Biurrun
d78d72da66 Set TCP protocol to is_streamed=1 as seeking is not possible.
Björn Axelsson, bjorn.axelsson intinor se

Originally committed as revision 12338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 15:29:10 +00:00
Luca Abeni
83cc23c5d3 Add some information about the stream bitrate, if available
Originally committed as revision 12331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:31:24 +00:00
Michael Niedermayer
1326621c1a Subtitle support. (untested)
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:06:49 +00:00
Baptiste Coudurier
112249de00 set block align for mace3/6
Originally committed as revision 12328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 12:06:57 +00:00
Baptiste Coudurier
28da7981d0 correctly compute bit rate for compressed audio, should fix seeking in aiff
Originally committed as revision 12327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 12:02:32 +00:00
Michael Niedermayer
675b8390f6 Ignore flags after pts/dts if there are no bytes left.
Fixes decoding of vdr-radio.vdr. (issue198)

Originally committed as revision 12310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 01:31:15 +00:00
Aurelien Jacobs
6e196eacc3 include required headers for int64_t and AV_RB16()
Originally committed as revision 12306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 23:00:48 +00:00
Aurelien Jacobs
abf2dc9c9a avi.h does not use anything from avcodec.h.
Originally committed as revision 12305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 22:56:07 +00:00
Reimar Döffinger
e7a5e2f626 Fix decoding of interlaced gif, e.g. http://samples.mplayerhq.hu/GIF/7up.gif
Originally committed as revision 12297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 13:16:29 +00:00
Michael Niedermayer
78db672cae Use block_align as the avi spec says.
fix issue274

Originally committed as revision 12296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 01:27:15 +00:00
Michael Niedermayer
143b082044 Print slightly more useful info.
Originally committed as revision 12295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 01:23:18 +00:00
Michael Niedermayer
a7805e2983 Fallback to sample rate if bit rate is 0. This avoids 0 timebases in nut.
Originally committed as revision 12294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 23:47:30 +00:00
Michael Niedermayer
9fdfd21c77 factorize
Originally committed as revision 12293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 23:13:07 +00:00
Michael Niedermayer
a048febdc4 subtitles (codec tag tables still missing ...)
Originally committed as revision 12292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 23:11:36 +00:00
Michael Niedermayer
5b08754912 Store aspect ratio in avis.
Originally committed as revision 12290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 19:51:31 +00:00
Mike Melanson
74e21d0352 fix wc3movie demuxer to conform to the PTS API
Originally committed as revision 12283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 02:28:47 +00:00
Mike Melanson
40e8e49700 fix the id CIN demuxer by using the pts API correctly
Originally committed as revision 12281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 01:43:19 +00:00
Aurelien Jacobs
73260a11e1 simplification proposed by Rich
Originally committed as revision 12280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 00:26:19 +00:00
Michael Niedermayer
2401daaf39 add cdvc
(from a patch by Dmitry Vassiliev // slydiman mail ru)

Originally committed as revision 12279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-29 11:41:57 +00:00
Baptiste Coudurier
0de2157fa4 set codec bps to grayscale bits, fix 256grey.mov
Originally committed as revision 12272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:05:19 +00:00
Benjamin Larsson
800b9c24b7 Add more riff IDs to support remuxing.
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 20:34:44 +00:00
Baptiste Coudurier
da00a1bdf4 add weird first atom to probe, finally fix bartjones.mov
Originally committed as revision 12265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 12:24:27 +00:00
Baptiste Coudurier
dbb3765779 free in case of multiple type == 2
Originally committed as revision 12263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:31:41 +00:00
Baptiste Coudurier
2f4568e525 return error if malloc fails
Originally committed as revision 12262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:56 +00:00
Baptiste Coudurier
dbb7cbf26e fix possible overflow with memmove
Originally committed as revision 12261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:05 +00:00
Aurelien Jacobs
0b247953c8 makes really sure that no undefined behavior can happen
Originally committed as revision 12258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 00:53:34 +00:00
Aurelien Jacobs
d597655f77 Avoid infinite loop.
uint64_t >> 64 is an undefined operation

Originally committed as revision 12253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 22:35:07 +00:00
Måns Rullgård
800c289a66 less preprocessor magic in version number macros
Originally committed as revision 12246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 20:37:59 +00:00
Baptiste Coudurier
26846ba515 support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:27:21 +00:00
Baptiste Coudurier
221e21b70d support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
Originally committed as revision 12241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:21:58 +00:00
Baptiste Coudurier
60f5c96ee6 remove useless braces
Originally committed as revision 12232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:42:07 +00:00
Baptiste Coudurier
18978a4918 indentation
Originally committed as revision 12231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:41:40 +00:00
Baptiste Coudurier
6d680e1b50 rescale frame size, fix i.3g2
Originally committed as revision 12230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:36:49 +00:00
Baptiste Coudurier
f296563e5f move parameters reset after setting stream parameters, will need those infos
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:31:36 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 10:21:33 +00:00
Baptiste Coudurier
4649fa9052 fix mace duration
Originally committed as revision 12209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:59:42 +00:00
Baptiste Coudurier
852859ff7c protect malloc overflow
Originally committed as revision 12208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:45:59 +00:00
Baptiste Coudurier
17871a02ad indentation
Originally committed as revision 12207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:44:15 +00:00
Baptiste Coudurier
b014dd7695 fail if extradata cannot be allocated
Originally committed as revision 12206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:42:32 +00:00
Baptiste Coudurier
9c7fd997f7 10l, protect malloc overflow
Originally committed as revision 12205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:38:37 +00:00
Baptiste Coudurier
b8d3daca62 support QDM2 in aiff, QDM2.aif
Originally committed as revision 12204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:29:34 +00:00
Baptiste Coudurier
4c638f0c7c remove useless close function
Originally committed as revision 12203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:24:30 +00:00
Baptiste Coudurier
54d8fd20fd indentation
Originally committed as revision 12202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:23:27 +00:00
Baptiste Coudurier
c6f5381215 remove useless casts
Originally committed as revision 12201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:15:26 +00:00
Baptiste Coudurier
9df21f24e1 cosmetics
Originally committed as revision 12200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:14:15 +00:00
Baptiste Coudurier
b4dc27a829 remove useless tags, codec_get_id matches independently and qt uses lower case tags
Originally committed as revision 12199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:08:26 +00:00
Baptiste Coudurier
e13c078333 set bps to uncompressed original sound data for compressed audio
according to aiff specs, qt set it to 16 for mace and ima4,
fail if block align is not set.

Originally committed as revision 12198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:00:31 +00:00
Baptiste Coudurier
e013015980 fix duration for ima4
Originally committed as revision 12197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 11:34:26 +00:00
Baptiste Coudurier
3a957df49e ima4 in aiff support
Originally committed as revision 12196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 10:57:22 +00:00
Måns Rullgård
76a448ed4f Install headers in $prefix/include/$libname
Install each library's headers in $prefix/include/$libname.
The installed headers use #include "lib*/*.h"; applications
are expected to do the same.

Specify only $prefix/include in .pc files.

Originally committed as revision 12194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 09:22:11 +00:00
Diego Biurrun
8af9090f4f cosmetics: Sort and prettyprint codec_wav_tags[].
Originally committed as revision 12192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 23:02:47 +00:00
Michael Niedermayer
ac6f133027 Set indexmem to a saner default.
Originally committed as revision 12190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 16:28:35 +00:00
Michael Niedermayer
58293e57e1 Fix issue357
Do what the spec says, insane or not:
"
Format 0 (uncompressed) and Format 3 (uncompressed little-endian) are similar. Both encode
uncompressed audio samples. For 8-bit samples, the two formats are identical. For 16-bit
samples, the two formats differ in byte ordering. In Format 0, 16-bit samples are encoded and
decoded according to the native byte ordering of the platform on which the encoder and Flash
Player, respectively, are running. In Format 3, 16-bit samples are always encoded in little-endian
order (least significant byte first), and are byte-swapped if necessary in Flash Player before
playback. Format 0 is clearly disadvantageous because it introduces a playback platform
dependency. For 16-bit samples, Format 3 is highly preferable to Format 0 for SWF version 4
or later.
"

Originally committed as revision 12184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 01:04:00 +00:00
Michael Niedermayer
44de39f93c flv/swf do not have a big endian codec id, they only support
little endian and native endian.

Originally committed as revision 12183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 00:57:15 +00:00
Benjamin Larsson
7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers.
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 23:30:41 +00:00
Nico Sabbi
a45b40c496 treat stream_type==0x82 as AUDIO_DTS when the program has a REGISTRATION_DESCRIPTOR with the value HDMV; approved by Mans
Originally committed as revision 12180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 10:57:38 +00:00
Michael Niedermayer
635fbcb17f revert 12156
Log:
Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.
----
A IMHO cleaner solution has been implemented.

Originally committed as revision 12162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 20:24:38 +00:00
Luca Abeni
d597e1b76c Fix computation of the "NTP time" field in RTCP SR packets, and do not
export times with microsecond precision

Originally committed as revision 12158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 10:19:35 +00:00
Michael Niedermayer
91acf9a8bc Get rid of a fake timestamp discontinuity at the begin of V.VOB.
This solution is not really correct but it is quite simple. Correct would
be to do a second pass over the packets after all the headers have been
collected.

Originally committed as revision 12157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 03:40:07 +00:00
Michael Niedermayer
ff2635b273 Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.

Originally committed as revision 12156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 03:20:06 +00:00
Måns Rullgård
e97ac1e6f5 Clean up lib* version definitions
Updating version numbers now requires changing only one place.

Originally committed as revision 12154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:50:28 +00:00
Michael Niedermayer
cea9642014 Fix ;;
Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:09:08 +00:00
Reimar Döffinger
a56dcc5793 Add some const, fixes warnings:
rtpenc_h264.c:69: warning: assignment discards qualifiers from pointer target type
rtpenc_h264.c:74: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 12152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:07:48 +00:00
Reimar Döffinger
a1fc4d4aa8 Missing const, fix warnings:
sdp.c:115: warning: assignment discards qualifiers from pointer target type
sdp.c:120: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 12151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 21:58:54 +00:00
Reimar Döffinger
591de5cf35 Fix misplaced const, avoids a cast-discards-qualifiers warning
Originally committed as revision 12146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 16:18:17 +00:00