Commit Graph

5611 Commits

Author SHA1 Message Date
Baptiste Coudurier
d46c84ea31 Stop parsing in read_header only after finding pmt, and
do not close pat filter so further pmt can be parsed.
Fix issue #1294.

Originally committed as revision 19530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-29 02:17:08 +00:00
Niobos
1aae34890c rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
Originally committed as revision 19529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-28 17:51:12 +00:00
Ronald S. Bultje
acfe8faf29 Cosmetics: remove spaces between function name and arguments in declaration,
and put return type ("static void") on the same line as function name.

Originally committed as revision 19519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:32:54 +00:00
Colin McQuillan
202a6697ba Use named initializers and use new/free_context() instead of extradata()
for context allocators. Patch by Colin McQuillan m niloc googlemail com.

Originally committed as revision 19518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:29:06 +00:00
Ronald S. Bultje
fccb1770e6 Implement support for EOS as used by WMS and other RTSP servers that do not
implement RTCP/bye. See "[PATCH] rtsp.c: EOS support" thread from a few
months back.

Originally committed as revision 19517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:03:53 +00:00
Ronald S. Bultje
c2f3eec445 Implement RTSP-MS/ASF packet parsing - this completes RTSP-MS support. See
discussion in "[PATCH] RTSP-MS 14/15: ASF packet parsing" thread on mailinglist.

Originally committed as revision 19516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:00:10 +00:00
Martin Storsjö
fbf7e805b0 Only consider -1 as an error return value for open().
This is:
 - what Posix says (-1 on error, >=0 on success)
 - fixing a bug on winCE (<0 sometimes)

Patch by Martin Storsjö: martin martin st

Originally committed as revision 19513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 12:36:22 +00:00
Ronald S. Bultje
2078ca16ee Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
ASF packet parsing" thread for discussion / reasoning.

Originally committed as revision 19509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 19:09:35 +00:00
Måns Rullgård
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 12:20:04 +00:00
Aurelien Jacobs
84c04e2519 fix various compilation dependencies
Originally committed as revision 19507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 21:28:44 +00:00
Aurelien Jacobs
23251d751b fix compilation of cavsvideo demuxer
Originally committed as revision 19506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 21:28:03 +00:00
Kostya Shishkov
b31ac3c8dd Register some additional AMF types in libavformat/flv.h
Originally committed as revision 19476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-21 07:18:14 +00:00
Stefano Sabatini
58ad770f92 Use globally consistent include guard names.
Originally committed as revision 19462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-19 09:38:58 +00:00
Art Clarke
ebb82604b0 Only free '*ic_ptr' when a caller has pre-allocated a context and passed it in
(wherein av_open_input_file assumes memory ownership).
Patch by Art Clarke a<surname> xuggle com

Originally committed as revision 19436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-15 10:00:16 +00:00
Martin Storsjö
73c1326809 Use ff_neterrno instead of errno in tcp.c.
If ff_neterrno() is checked instead of errno, that's probably what should be
used in the return value.
As a sideeffect, this gives better compatibility with Windows (CE), where
network errors aren't visible in errno.)
patch by Martin Storsjö, martin martin st

Originally committed as revision 19433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-15 05:52:49 +00:00
İsmail Dönmez
b504ce57ed Only #define lseek to _lseeki64 on MinGW, not MinGW CE.
This fixes compilation on WinCE, which does not support _lseeki64.
patch by Ismail Dönmez, ismail namtrac org

Originally committed as revision 19425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-13 17:16:36 +00:00
Diego Biurrun
647c2356a6 Make (de)muxers for format variants select the main format (de)muxer.
It makes little sense to enable the variant without the main format.

Originally committed as revision 19420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 22:31:05 +00:00
Phil Rutschman
5a1e202b87 Add block_align to sox input.
Patch by Phil Rutschman: name.surname modsystems com

Originally committed as revision 19371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 08:52:56 +00:00
Art Clarke
56c6cf287b Fix mem leak when user preallocates an AVFormatContext, passes it to
av_open_input_file(), but the file does not exist.
Patch by Art Clarke a$(surname) xuggle com

Originally committed as revision 19370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 08:26:57 +00:00
Aurelien Jacobs
df2bd71aeb flvdec: expose metadata through the generic metadata API
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:54:37 +00:00
Aurelien Jacobs
09e54e1ff8 flvdec: re-enable metadata parsing
duration and videodatarate values are actually useful
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:49:33 +00:00
Aurelien Jacobs
8caa0f0651 flvdec: don't set format and codec context from metadata values
This has proven to be useless and even harmfull since r18460 (expect
for duration and videodatarate).
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:46:37 +00:00
Reimar Döffinger
96f0731a26 Check for packet_length 0, it is already treated as invalid by the padding check,
but that resulted in a confusing/wrong error message.

Originally committed as revision 19361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 17:08:32 +00:00
Baptiste Coudurier
4eba9cdd07 fix and simplify long gop mpeg codec ul computation
Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 08:02:01 +00:00
Baptiste Coudurier
df1550f081 set index duration to 0 for cbr, specifying whole container coverage
Originally committed as revision 19338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:56:58 +00:00
Baptiste Coudurier
76b092e207 use ber4 length for descriptors preferred by specs
Originally committed as revision 19337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:52:28 +00:00
Baptiste Coudurier
6a43aab01b write profile and level local tag in mpeg descriptor
Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-04 07:49:12 +00:00
Reimar Döffinger
11d058b7b3 Replace invalid Theora frame rate by 25 FPS.
Avoids division by 0 due to e.g. time_base denominator being 0.

Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:31:09 +00:00
Reimar Döffinger
3dcddf82ed Check for failed extradata malloc, fixes a crash in out-of-memory conditions
or with extremely large extradata.

Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:27:52 +00:00
Reimar Döffinger
5a4a4d7839 Check size of "strf" header against size of enclosing "LIST" if there is one.
Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:26:14 +00:00
Reimar Döffinger
b098b30905 Fix indentation
Originally committed as revision 19331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:18:56 +00:00
Reimar Döffinger
68a10b40bc Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
Originally committed as revision 19330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:18:07 +00:00
Michael Niedermayer
e7e5d1e990 If either of num or den is 0 make both 0 in av_set_pts_info().
Originally committed as revision 19326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-02 12:47:58 +00:00
Michael Niedermayer
d218a86a0d Make sure av_set_pts_info() does not set the fields of a timebase to
negative values.

Originally committed as revision 19325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-01 20:52:48 +00:00
Michael Niedermayer
dec14949a6 Make arguments of av_set_pts_info() unsigned.
Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1

Originally committed as revision 19319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-01 18:50:31 +00:00
Baptiste Coudurier
b399b932b7 cosmetics, change case and comments alignment
Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 07:43:32 +00:00
Baptiste Coudurier
61f9e3c16a correctly compute frame flags with closed gop
Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-30 07:41:40 +00:00
Alex Converse
ad92558754 Use av_log_missing_feature in the ADTS encoder. (Pseudo reverts r19173).
Originally committed as revision 19299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 22:48:07 +00:00
Stefano Sabatini
38e54a75ab Make the configure script select the input/output devices using
--enable-indev, --enable-outdev rather than --enable-demuxer,
--enable-muxer as before, same for disabling them.

Originally committed as revision 19293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 18:49:15 +00:00
Michael Niedermayer
d004179e19 indent
Originally committed as revision 19292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 18:37:29 +00:00
Michael Niedermayer
3fd5a75b07 id3v2.4.0 uses syncsafe integers for sizes of frames.
Fixes issue1234
Fixes regression introduced in r19275

Originally committed as revision 19291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 18:36:49 +00:00
Stefano Sabatini
2b75bde648 Remove inconsistent use of a @brief command in av_write_trailer()
doxy.

Originally committed as revision 19289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-28 21:05:46 +00:00
Stefano Sabatini
d1b9adf252 Use consistently the third person in doxy, as recommended by the
javadoc specs.

Originally committed as revision 19288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-28 21:01:51 +00:00
Michael Niedermayer
1cd4422163 Fix id3v2.2 frame size parsing.
Fixes issue1202.

Originally committed as revision 19276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:44:44 +00:00
Michael Niedermayer
47f42aec38 Fix id3v2.3/4 tag size parsing.
Fixes issue1106

Originally committed as revision 19275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:26:39 +00:00
Baptiste Coudurier
57011a13d6 use AVFormatContext->probesize in av_find_stream_info and raise default to 5M
Originally committed as revision 19274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:10:27 +00:00
Baptiste Coudurier
d23612efe1 Only set CODEC_ID_PROBE when a packet from a stream having a PES header
is read.

Originally committed as revision 19273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:01:16 +00:00
Baptiste Coudurier
af122d6a80 limit raw packet buffer size used for codec probing
Originally committed as revision 19272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 18:48:57 +00:00
Baptiste Coudurier
d862fce758 only set par if it does not indicates a rotation, ex iphone 3GS
Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 00:17:47 +00:00
Ronald S. Bultje
91d19d471b Remove any reference to ASFContext.packet_size and replace it with
AVFormatContext.packet_size. See "[PATCH] asf*.c/h: use
AVFormatContext->packet_size instead of own copy" thread on ML.

Originally committed as revision 19270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 23:04:05 +00:00
Justin Ruggles
c1c206b343 flvdec: Build a Speex header during FLV demuxing using required and
default values. This is needed because FLV files with Speex do not
contain a Speex header, which is necessary for stream copy.

Originally committed as revision 19267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 22:10:53 +00:00
Reimar Döffinger
e1c1b0ff09 Reindent after last patch.
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:40:00 +00:00
Reimar Döffinger
3fe4d5d4e6 mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.

Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:38:42 +00:00
Reimar Döffinger
5dc5c43bda mov_read_packet: extract code that searches for the stream/sample to demux next
into a separate function.

Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:57:53 +00:00
Reimar Döffinger
a2f3851166 mov_read_packet: if dv_get_packet fails, return exactly its error value
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).

Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:50:46 +00:00
Reimar Döffinger
69fc436cbc In mov_read_packet remember the AVStream we want to demux next instead of the
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.

Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:23:40 +00:00
Baptiste Coudurier
6a63ff19b6 check stream existence before assignment, fix #1222
Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 03:38:47 +00:00
Peter Holik
7995ed8e69 Add support for "chunked" data blocks. Patch by Peter Holik (peter holik at).
Originally committed as revision 19256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-23 15:38:53 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
Ronald S. Bultje
92400be255 Change packet_size from signed to unsigned, since it never has a negative
value. Currently, this is only used in qcp.c and mpegenc.c, and they are
practically unaffected by this change.

See "[PATCH] make packet_size in AVFormatContext unsigned" thread on ML.

Originally committed as revision 19250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 16:52:02 +00:00
Justin Ruggles
87b4dd3b96 oggenc: Change error log text. An error here does not necessarily mean
corrupted data.

Originally committed as revision 19248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-21 20:18:29 +00:00
Justin Ruggles
3f2eadf4fe oggenc: return error value from ogg_build_flac_headers()
Originally committed as revision 19247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-21 20:16:48 +00:00
Justin Ruggles
4315aa8b05 cosmetics: spacing and comments
Originally committed as revision 19246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-21 20:14:58 +00:00
Justin Ruggles
e9a32230c3 oggenc: check for failed av_mallocz()
Originally committed as revision 19245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-21 20:13:54 +00:00
Carl Eugen Hoyos
a481293f13 Revert unintended hunk of r19241.
Originally committed as revision 19242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 14:51:03 +00:00
Carl Eugen Hoyos
df028e8c6a Revert r19239: It broke four conformance tests.
Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 14:47:38 +00:00
Yoshihisa Uchida
3f3f3ba799 Fix onMetaData property count in flv files (issue 1206).
Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

Originally committed as revision 19236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 12:52:48 +00:00
Jai Menon
9ed3afcb7f Print meaningful error messages when url_fopen fails.
Originally committed as revision 19230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 09:00:12 +00:00
Wolfram Gloger
896f2b3212 add 0-termination in table, patch by Wolfram Gloger, wmglo at dent dot med dot uni-muenchen dot de
Originally committed as revision 19229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 06:09:30 +00:00
Brian Brice
8a4ea200e1 fix dvcprohd 720p channels 3 and 4 audio timestamps, patch by Brian Brice, bbrice at gmail dot com
Originally committed as revision 19228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 21:36:21 +00:00
Patrick Dehne
d52b90bdb4 Add support for id3 tag parsing for ADTS AAC streams
Patch by Patrick Dehne ( patrick mysonicweb com )

Originally committed as revision 19225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:36:47 +00:00
Patrick Dehne
50fcd5be36 Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:03:35 +00:00
Reimar Döffinger
2a04d6e772 Add support for muxing XSUB subtitles to AVI muxer.
Originally committed as revision 19223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 13:26:10 +00:00
Jason Garrett-Glaser
bc7ea1e5cf Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file.
Originally committed as revision 19219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 19:31:12 +00:00
Michael Niedermayer
71ee651559 Print why av_find_stream_info() failed, this is a rather common question
during debugging ...

Originally committed as revision 19217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 00:22:08 +00:00
Ronald S. Bultje
f4ca612fbd Set restrictions on packet_size, as per ISO-11172 / H-222 specifications
(max packet size should fit in 13 bits as a kB value, so 1<<23, plus the
header which is 10 bytes), and as per mpegenc.c internal assumptions
(min packet size is 20 bytes). See "[PATCH] make packet_size in
AVFormatContext unsigned" thread.

Originally committed as revision 19215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 19:04:02 +00:00
Benoit Fouet
61ac77f1af Remove a test on an always false condition.
Originally committed as revision 19214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 07:05:17 +00:00
Alexander Strange
0b389aee4d Add '.mp1' for MP1 audio in MOV/CAF.
Tested with streamcopy of 'mp1-sample.mp1' in incoming.

Originally committed as revision 19212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 00:37:06 +00:00
Jason Garrett-Glaser
b46f18e5d2 Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file.
Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:50:02 +00:00
Art Clarke
e1d8d7bb4b Downgrade message log level (from AV_LOG_ERROR to AV_LOG_DEBUG) about
skipped metadata packet in FLV demuxer.

Patch by Art Clarke a${surname} At xuggle - com.

Originally committed as revision 19210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:14:59 +00:00
Patrick Dehne
d9982edfed The AAC demuxer now depends on id3v1.o.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 08:38:11 +00:00
Baptiste Coudurier
53e099de8b check atom size against edit_count to avoid very long loop
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 02:07:41 +00:00
Baptiste Coudurier
7060667580 fix probing and demuxing of pond.dv, issue #887
Originally committed as revision 19197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 01:41:59 +00:00
Baptiste Coudurier
d509c743b7 check if frame size matches old sys and assumes corrupted input, fixes #1192
Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:34:28 +00:00
Justin Ruggles
d7bb185f99 Add a VorbisComment metadata conversion table and use it in the FLAC and
Ogg demuxers.

Originally committed as revision 19186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 22:45:58 +00:00
Aurelien Jacobs
4f909c7675 matroskadec: prepend TargetType to metadata key name
Originally committed as revision 19184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 22:29:38 +00:00
Kostya Shishkov
8c1ff0abae Allocate a bit more memory for MPC SV8 seek table, so bitreader won't read
beyond allocated block.

Originally committed as revision 19181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 06:39:01 +00:00
Jason Garrett-Glaser
67fe508916 Analysis of logs show that there are in fact some files with m1v1 too (not just m2v2),
which is documented to be MPEG-1 video.  Adding fourcc to isom.c.

Originally committed as revision 19180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 03:02:16 +00:00
Peter Ross
eacfe8581d Electronic Arts demuxer: support Madcow video tag
Originally committed as revision 19179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:20:54 +00:00
David Conrad
86b61d4241 Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.

Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:50:57 +00:00
Jason Garrett-Glaser
761cb87173 Add "0x11005354" as a fourcc for MOV audio; fixes audio detection in a problematic MOV file.
The audio is actually adpcm_ima_wav.

Originally committed as revision 19176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:16:39 +00:00
Alex Converse
70f99f8dd2 Do not include libavcodec/internal.h in the ADTS muxer.
Originally committed as revision 19173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 19:49:46 +00:00
Jason Garrett-Glaser
fc3fc0293d Add new FOURCC (0x0003) for raw DIB video, set flip flag accordingly.
Fixes a few AVI files from what is probably a mobile phone video camera.

Originally committed as revision 19172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 17:39:56 +00:00
Jai Menon
8e6e9bacc4 Associate the 0x6c75 TwoCC used in certain Kodak cameras
to the PCM Mu-law decoder.
Fixes Issue 1178.

Originally committed as revision 19166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 13:21:01 +00:00
Jimmy Christensen
94d3d6a468 DPX (Digital Picture Exchange) image decoder
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 05:29:29 +00:00
David Conrad
34edd9948d Add sac3 to mp4 fourccs for mov+h264+aac-sac3+mp4s+ETERNAL_cut.mp4
Originally committed as revision 19162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 05:26:40 +00:00
Jason Garrett-Glaser
14ed2d9983 Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files.
Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 02:20:26 +00:00
Jason Garrett-Glaser
be43ae6651 Add alternate fourcc for QCELP audio (qclq). Fixes a problematic MOV file.
Originally committed as revision 19159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 01:09:49 +00:00
Diego Biurrun
1d4b1bf2f6 cosmetics: Prettyprint one more line to have columns line up.
Originally committed as revision 19158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 20:45:35 +00:00
Diego Biurrun
7d7b8c32c9 cosmetics: Reformat to K&R and prettyprint newly created files.
Originally committed as revision 19156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 15:35:23 +00:00
Patrick Dehne
7541118286 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 15:26:57 +00:00
Baptiste Coudurier
bbe46bc4c2 Remove time_rate, we cannot compute exactly when fragments are
used and we cannot determine if fragments are present or not in
streamed mode.

Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 05:13:23 +00:00
Baptiste Coudurier
818062f2f3 if b frames are parsed, set codec->has_b_frames
Originally committed as revision 19147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 04:30:05 +00:00
Luca Barbato
ec606b36b4 Support seeking as defined by the rfc
a PLAY with Range alone while in PLAY status should be interpreted
as an enqueue
a PAUSE followed by a PLAY with Range is the proper way to ask to
seek to a point.

See rfc2326

Originally committed as revision 19143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 15:08:02 +00:00
Luca Barbato
4db819bc7f Make sure buffer end remains constant within the loop
otherwise ff_find_start_code could read over the buffer size

Originally committed as revision 19142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 14:56:50 +00:00
Ronald S. Bultje
277a28e8fc Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
make get/parse_packet static" thread from 2 months ago.

Originally committed as revision 19140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 20:58:32 +00:00
Jai Menon
3dfadf7b1e Add additional dependencies for sdp and rtsp demuxers.
This fixes compilation when the rtsp muxer is disabled.

Originally committed as revision 19137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 18:30:15 +00:00
Peter Holik
a52dc730cf Cosmetics : Use dprintf instead of printf.
Patch by Peter Holik < $firstname @ $lastname . at >

Originally committed as revision 19126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 17:32:59 +00:00
Jai Menon
2b01a52031 Cosmetics : Fix indentation after last commit.
Originally committed as revision 19125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 16:46:40 +00:00
Peter Holik
682d49f4ea Introduce http_get_line and modify http_connect to use http_get_line.
Patch by Peter Holik <$firstname @ $lastname . at>

Originally committed as revision 19124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 16:44:21 +00:00
Stefano Sabatini
bf7e799c9e Remove '\p', '\c' and '\e' doxygen markup from doxy, as it should
improve plain text doxy readability.

See the thread: "[RFC] Should we use doxygen markup?".

Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 09:35:15 +00:00
David Conrad
12d7c0793b Ensure that the extradata buffer is padded appripriately in the ogg demuxer.
Spotted by valgrind.

Originally committed as revision 19119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 23:39:11 +00:00
Kostya Shishkov
0e848977ce Move function for reading whole specified amount of data from RTSP
demuxer into more common place.

Originally committed as revision 19087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-04 06:25:53 +00:00
Alex Converse
007c47e8b9 Add the .adts file extension to the ADTS muxer.
Originally committed as revision 19085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 23:34:35 +00:00
Baptiste Coudurier
281551131d broken stsd length might be < 16, fix elst-assert.mp4
Originally committed as revision 19084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 23:13:53 +00:00
Baptiste Coudurier
502d6c0a23 Change find_tag return type to int64_t, fix a bug
where size is negative and url_fseek then seek backward
causing infinite loop. This also support 4gb unsigned size.

Originally committed as revision 19083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 22:36:59 +00:00
Baptiste Coudurier
b2984add80 do not parse full header for private streams
Originally committed as revision 19075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 07:53:44 +00:00
Baptiste Coudurier
617c461625 correctly handle maximum streams limit
Originally committed as revision 19074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 07:30:19 +00:00
Baptiste Coudurier
1c4df2ab24 export data from private streams
Originally committed as revision 19073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 07:26:58 +00:00
Baptiste Coudurier
4a01b3c714 initialize pes state to skip
Originally committed as revision 19029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:47:40 +00:00
Larbi Joubala
15c315b7f1 fix 3gp metadata, write strings in UTF8, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
Originally committed as revision 19023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 05:24:16 +00:00
Baptiste Coudurier
1f07654330 print reg desc in a more friendly way
Originally committed as revision 19021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:47:30 +00:00
Baptiste Coudurier
ad183ff4e2 give context to dprintf
Originally committed as revision 19020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:45:51 +00:00
Baptiste Coudurier
fc72ad1990 print registration descriptor in debug
Originally committed as revision 19019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:41:47 +00:00
Baptiste Coudurier
7e69621f56 split audio chunks in mov demuxer
Originally committed as revision 19018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:36:26 +00:00
Baptiste Coudurier
84c7d45e02 0x7a is E-AC3 descriptor
Originally committed as revision 19017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:35:05 +00:00
Baptiste Coudurier
67c9cd696a fix compilation with DEBUG defined
Originally committed as revision 19016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:32:45 +00:00
Baptiste Coudurier
e695906ec7 use dts codec probing
Originally committed as revision 19014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:13:25 +00:00
Baptiste Coudurier
7103a77b4d set codec_tag to stream type, so user can deal with it
Originally committed as revision 19013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:10:15 +00:00
Baptiste Coudurier
5b3c4c8ac6 set codec_tag to registration descriptor if present
Originally committed as revision 19012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:04:20 +00:00
Baptiste Coudurier
ffdbada6c1 add streams even if they are not present in PMT, fix #1092 and #835
Originally committed as revision 19011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:55:23 +00:00
Baptiste Coudurier
e6eb74d84c remove no longer needed fake dvbsub stream type
Originally committed as revision 19010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:46:24 +00:00
Baptiste Coudurier
f2c357d95d reindent
Originally committed as revision 19009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:45:45 +00:00
Baptiste Coudurier
ed68efad8b remove no longer needed init
Originally committed as revision 19008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:44:03 +00:00
Baptiste Coudurier
6a2a50f81f factorize
Originally committed as revision 19007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:40:36 +00:00
Baptiste Coudurier
f42d1d824e simplify and merge
Originally committed as revision 19006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:35:29 +00:00
Baptiste Coudurier
08f94e989f move new_pes_av_stream to avoid forward declaration
Originally committed as revision 19005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:12:25 +00:00
Baptiste Coudurier
2fef7b5374 remove defines
Originally committed as revision 19004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 03:02:12 +00:00
Baptiste Coudurier
8430f3ecb8 rework stream type and codec identification
Originally committed as revision 19003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 02:56:15 +00:00
Baptiste Coudurier
40b0872a56 cosmetics, reindent, remove useless braces, whitespaces
Originally committed as revision 19002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 00:33:37 +00:00
Baptiste Coudurier
64ab5fa3df export all streams in ts demuxer
Originally committed as revision 19001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 00:31:47 +00:00
Baptiste Coudurier
86cb7e33cc fix codec probing, stop after MAX_PROBE_PACKETS and return all packets
Originally committed as revision 19000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 00:24:06 +00:00
Daniel Verkamp
cbfe5bee2e Implement SoX native format muxer and demuxer.
Patch by Daniel Verkamp $firstname@drv DOT nu.

Originally committed as revision 18998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 18:51:15 +00:00
Baptiste Coudurier
9291fdf7bc return AVERROR_EOF
Originally committed as revision 18993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:16:44 +00:00
Baptiste Coudurier
350f2c2cef return AVERROR_EOF
Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:15:27 +00:00
Baptiste Coudurier
db5dc02bd7 cast size to int64_t to avoid overflow
Originally committed as revision 18991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 04:08:43 +00:00
Luca Abeni
6f62e2c72d Correctly set the "AU size" field in the payload header for
fragmented AAC frames

Originally committed as revision 18984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-29 13:46:46 +00:00
Stefano Sabatini
a330317890 Document match_ext().
Originally committed as revision 18971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 22:43:52 +00:00
Baptiste Coudurier
6125d86597 technically mp2 in pva needs AVSTREAM_PARSE_FULL
Originally committed as revision 18966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 06:58:22 +00:00
Baptiste Coudurier
6c7c2f7bb3 support AVDISCARD_ALL in mpegts demuxer
Originally committed as revision 18964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 01:29:55 +00:00
Baptiste Coudurier
bdfa98249a return error in mpegts_push_data and propagate it
Originally committed as revision 18963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 00:56:31 +00:00
Baptiste Coudurier
64d882155d 10l, forgot ';', fix compilation
Originally committed as revision 18962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 00:48:39 +00:00
Baptiste Coudurier
a5685be502 check that len is not negative
Originally committed as revision 18961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 00:46:20 +00:00
Baptiste Coudurier
0c1375575a demux whole PES packets from TS
Originally committed as revision 18960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 00:44:00 +00:00
Baptiste Coudurier
e9859317eb move DEBUG define before include to get dprintf
Originally committed as revision 18956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-26 20:13:03 +00:00
Michael Niedermayer
71b0654cc6 Support YVU9 AVI 4cc.
Fixes issue1068.

Originally committed as revision 18952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-26 03:51:00 +00:00
Ben Littler
f9928b7e80 map dvh1 fourcc to dv, fixes incoming/dvh1_sample
Originally committed as revision 18951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-26 01:14:10 +00:00
Stefano Sabatini
597b4b3f03 Define struct URLContext and typedef it to URLContext in one step.
Originally committed as revision 18948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 22:17:27 +00:00
Stefano Sabatini
819174fa1b Remove \p and \e doxygen markup.
Originally committed as revision 18947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 22:05:43 +00:00
Michael Niedermayer
8c68f25b20 Workaround broken AVI files from DC-XZ6.
Fixes issue897.

Originally committed as revision 18942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 18:28:26 +00:00
Baptiste Coudurier
c13b250bad move DEBUG define before include to get dprintf and change printf to dprintf
Originally committed as revision 18932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-24 22:59:25 +00:00
Baptiste Coudurier
46b4019bfa fix get_str16_nolen with odd len, fix #1065
Originally committed as revision 18929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-24 10:26:41 +00:00
Baptiste Coudurier
c9d7cd6dca move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG
Originally committed as revision 18928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-24 09:59:53 +00:00
Larbi Joubala
606d48cee1 fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
Originally committed as revision 18911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 07:17:17 +00:00
Baptiste Coudurier
84df78b476 simplify pes timestamps fetching, based on a patch by corp186, chasedouglas at gmail dot com
Originally committed as revision 18910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 06:25:44 +00:00
corp186
c69d224102 compute total bitrate more accurately, patch by corp186, chasedouglas at gmail dot com
Originally committed as revision 18909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 06:09:16 +00:00
Baptiste Coudurier
c43accabd3 remove useless include
Originally committed as revision 18906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 03:05:56 +00:00
Baptiste Coudurier
4969cc0bd8 fail if stream fifo could not be allocated
Originally committed as revision 18897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-22 19:11:56 +00:00
David Conrad
533c3c84e7 Set speex frame_size in ogg demuxer
Originally committed as revision 18895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-22 18:34:01 +00:00
Baptiste Coudurier
ec6b02b6fd check av_fifo_alloc return
Originally committed as revision 18892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-21 23:12:41 +00:00
Baptiste Coudurier
24dc7776ff correctly check for audio streams in mpeg ps muxer, fix multiple audio tracks
Originally committed as revision 18891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-21 22:33:17 +00:00
Kenan Gillet
cdce0fb845 Add QCP demuxer.
Originally committed as revision 18883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-20 17:19:39 +00:00
Yao Peter
eb853afb8a Fix the M bit for multi-packet NALs.
Patch by Yao Peter (peter AT yuvad DOT com)

Originally committed as revision 18858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 17:11:47 +00:00
Måns Rullgård
78ad664a7e oma: fix build if memcmp() is a macro
Any C library function may be a macro, so compound literals
passed to memcmp() must be surrounded by parens to avoid being
split on commas.

Originally committed as revision 18856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 15:09:30 +00:00
Baptiste Coudurier
2d5fabc87a move increment after debug print
Originally committed as revision 18851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 04:08:34 +00:00
Baptiste Coudurier
e1316b19ea write 'stps' for mpeg-2 open gop in .mov
Originally committed as revision 18838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 06:11:53 +00:00
Baptiste Coudurier
8be080aebb free Track and unset priv_data to avoid double free, fix memleak
Originally committed as revision 18836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 05:33:05 +00:00
Baptiste Coudurier
df099252bb reindent
Originally committed as revision 18835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 04:44:37 +00:00
Baptiste Coudurier
58a830239d remove unneeded length checks
Originally committed as revision 18834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 04:43:44 +00:00
Baptiste Coudurier
ab4752e382 use flags field and remove key_frame field
Originally committed as revision 18831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 21:05:52 +00:00
Baptiste Coudurier
fe335ff530 change cts type to int, save some space
Originally committed as revision 18830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 20:54:19 +00:00
David Conrad
0a8dedc9e1 Use skip_bits_long() for large skips
This fixes ogg/theora on ARM (more generally the A32 bitstream reader)

Originally committed as revision 18819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 00:02:07 +00:00
Alex Converse
97d4318347 Add PCE support to the ADTS muxer.
Originally committed as revision 18818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 22:59:58 +00:00
Baptiste Coudurier
171a353159 parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 08:31:22 +00:00
Baptiste Coudurier
1a11c0aa8a align and update doxygen
Originally committed as revision 18812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 08:01:33 +00:00
Baptiste Coudurier
41e6499996 remove comment
Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:57:08 +00:00
Baptiste Coudurier
4b29ed399f Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
We have now dts <= pts, note that for some B frames dts+1 == pts can happen
if a crappy timebase is used instead of correct /1001.

Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:55:03 +00:00
Baptiste Coudurier
3a86d3f646 factorize av_set_pts_info
Originally committed as revision 18808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 04:22:53 +00:00
Baptiste Coudurier
1fbbedff85 cosmetics, alignment
Originally committed as revision 18807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 04:20:23 +00:00
Diego Biurrun
e19f995263 Fix bandwith vs. bandwiDth typo.
Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 23:40:22 +00:00
Baptiste Coudurier
e131922e48 v210 mov fourcc
Originally committed as revision 18803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 20:00:11 +00:00
Baptiste Coudurier
9c4e266c1c v210 avi fourcc, v210_720p.avi
Originally committed as revision 18802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 19:58:13 +00:00
Cyril Comparon
5f1ac36dd2 Per-stream language-tags extraction in asfdec.
Patch by Cyril Comparon: gmail(name, surname);
Original thread: Suggestion for a centralized language-tag facility in libavformat
Date: 04/10/2009 07:33 PM

Originally committed as revision 18800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 12:35:46 +00:00
David Conrad
56bb72dc3b Use chroma_sample_location in reading/writing yuv4mpeg
Originally committed as revision 18796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-11 04:35:15 +00:00
Baptiste Coudurier
24ac50525a move free data in the video case
Originally committed as revision 18793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-11 02:36:57 +00:00
Baptiste Coudurier
e4358e70f8 write a single pes for video frames, some proprietary player needs it
Originally committed as revision 18792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-11 02:30:29 +00:00
Baptiste Coudurier
f65aad9587 rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
Originally committed as revision 18790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:41:01 +00:00
Baptiste Coudurier
5b50b8f57f bgra in .mov muxing
Originally committed as revision 18789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:14:42 +00:00
Baptiste Coudurier
dfb0471fce correct pixfmt for argb
Originally committed as revision 18788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:12:36 +00:00
Baptiste Coudurier
ed88074a32 rgba in .mov muxing
Originally committed as revision 18787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:11:11 +00:00
Benjamin Larsson
0871e65cf6 Remove unused code found by CSA
Originally committed as revision 18783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 14:33:40 +00:00
Baptiste Coudurier
b69017af87 ensure first pts is set, according to specs
Originally committed as revision 18781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 01:57:21 +00:00
Baptiste Coudurier
1e8857882b remove useless max_payload_size variable
Originally committed as revision 18780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 01:41:35 +00:00
Baptiste Coudurier
8f14cdee73 do not write dts if pts is not set
Originally committed as revision 18779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 01:37:58 +00:00
Baptiste Coudurier
31df40a130 fix total bitrate computation, based on patch by corp186, chasedouglas at gmail dot com
Originally committed as revision 18778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 01:02:18 +00:00
Daniel Verkamp
fc430e8fab Warning fix: Make ogg_stream.codec const
This matches the return value of ogg_find_codec and fixes
"libavformat/oggdec.c:333: warning: assignment discards qualifiers from
pointer target type"

Patch by Daniel Verkamp (daniel - drv . nu)

Originally committed as revision 18769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-06 23:02:26 +00:00
Daniel Verkamp
7c7d3e09f6 Add 8088flex TMV file demuxer.
Patch by Daniel Verkamp daniel|at|drv|nu.

Originally committed as revision 18766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-06 22:01:54 +00:00
Laurent Aimar
992f7db060 Add floating point audio decoding to WavPack decoder.
Patch by Laurent Aimar (fenrir at `antonym of 'audio'+antonym of 'WAN'` dot org)

Originally committed as revision 18754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-06 05:40:43 +00:00
Baptiste Coudurier
c20a305bca dvh1 avi fourcc, dvh1_sample_truncated.avi, issue #1034
Originally committed as revision 18739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-05 04:30:08 +00:00
Baptiste Coudurier
c239a65b70 more dvcprohd .mov fourcc, see #1034
Originally committed as revision 18738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-05 04:27:24 +00:00
Benjamin Larsson
6b71ed1678 Remove dead assignments found by CSA
Originally committed as revision 18733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-03 09:32:40 +00:00
Stefano Sabatini
4b11e833b8 Convert names to the FFmpeg style.
Originally committed as revision 18711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-28 19:51:50 +00:00
Cyril Comparon
276f8e2b9b Add avlanguage helpers in libavformat.
Patch by Cyril Comparon: standard_gmail_full_name_address
Original thread: Suggestion for a centralized language-tag facility in libavformat
Date: 04/10/2009 07:33 PM

Originally committed as revision 18698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-27 07:27:39 +00:00
Ivo van Poorten
896873b564 avoid possibly uninitialized return value
(found by clang static analyzer)

Originally committed as revision 18669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-23 18:44:03 +00:00
Jai Menon
4fabb60ddb NSV : Add TOC2 parsing and seeking support.
Originally committed as revision 18662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 19:37:57 +00:00
Andreas Öman
0e1ccdeb11 It should be #if, not #ifdef
Originally committed as revision 18659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 08:39:46 +00:00
Michael Niedermayer
f9f2ab8229 Require 4 instead of 3 frames for detecting mp3,
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)

Originally committed as revision 18657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 02:58:20 +00:00
Ramiro Polla
9145021d68 Add raw MLP muxer.
Originally committed as revision 18652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 23:23:15 +00:00
Luca Abeni
46ff7a5f4a Fix crash when receiving from SDP
Originally committed as revision 18635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-20 20:06:55 +00:00
Michael Niedermayer
5aef84623a Add zygo fourcc.
Originally committed as revision 18628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 21:24:36 +00:00
Diego Biurrun
dc1ed61432 Mark gsize variable as av_unused, fixes the warning:
libavformat/asfdec.c:995: warning: unused variable ‘gsize’

Originally committed as revision 18620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 13:29:11 +00:00
Diego Biurrun
e0a6d2c365 Revert previous removal of gsize variable. It breaks seeking.
Originally committed as revision 18618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 11:40:03 +00:00
Diego Biurrun
7b7b19b620 Remove unused variable gsize, fixes the warning:
libavformat/asfdec.c:995: warning: unused variable 'gsize'

Originally committed as revision 18607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 15:01:20 +00:00
Jai Menon
a00f440f37 Cosmetics : reindent after last commit and remove redundant comment.
Originally committed as revision 18605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 08:35:46 +00:00
Jai Menon
d6ce84b8f9 Add speex tag to nsv_codec_audio_tags.
Originally committed as revision 18604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 08:34:15 +00:00
Jai Menon
67d04927f7 Change nsvf_index_data to nsvs_file_offset for increased clarity.
Originally committed as revision 18603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 05:54:47 +00:00
Jai Menon
b24bbbb4da Introduce codec id for MPEG-4 ALS and associate it with corresponding
AudioObjectType. Also bump libavcodec minor version.

Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 19:17:14 +00:00
Michael Niedermayer
551b41d4bf Remove useless init from aiff_read_header() found by CSA.
Originally committed as revision 18580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 18:18:29 +00:00
Michael Niedermayer
e8c9383914 Remove 2 ++ from check_pes() that are useless, found by CSA.
Originally committed as revision 18577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 18:08:39 +00:00
Michael Niedermayer
4eec260642 Remove unused variable from flv_read_metabody() found by CSA.
Originally committed as revision 18571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 17:42:41 +00:00
Michael Niedermayer
5ce73e2352 Remove nonsensical assignment from asf_read_seek() found by CSA.
Originally committed as revision 18565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 15:13:01 +00:00
Michael Niedermayer
b33d75fd80 Move declarations in sync() closer to where they are used.
Originally committed as revision 18556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 14:38:52 +00:00
Michael Niedermayer
236580b478 Remove unused variable from asf_read_header() found by CSA.
Originally committed as revision 18555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 14:16:37 +00:00
Ronald S. Bultje
1d0036b01f Change another AVERROR(EIO) inot AVERROR_EOF, because it really signals EOF,
not a stream error. This also fixes an infinite loop on EOS during ASF file
playback, and Michael claims he "likes the patch" (ref: [PATCH] RTSP-MS
15/15: move packet_time_start zero value assignment in asf.c" mailinglist
tread).

Originally committed as revision 18552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 14:05:57 +00:00
Michael Niedermayer
d728e3cd28 Moving variable declarations in asf_build_simple_index() to clarify&prettify code.
Originally committed as revision 18543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 12:37:39 +00:00
Reimar Döffinger
c3481d18b4 Remove unused audio_pts field from ea demuxer struct
Originally committed as revision 18538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-16 12:46:06 +00:00
Reimar Döffinger
3f19810d9e Remove unused code from Westwood VQA/AUD demuxer.
Originally committed as revision 18537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-16 12:39:14 +00:00
Ronald S. Bultje
799a0722fc Replace AVERROR(EIO) by AVERROR_EOF on end-of-file. See mailinglist
thread "[PATCH] RTSP-MS 15/15: move packet_time_start zero value
assignment in asf.c".

Originally committed as revision 18531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-16 00:41:31 +00:00
Michael Niedermayer
7e030c4739 Clarify which exact variant of ISO 639 is used. (The ISO spec explicitly
requires this to be clear)

Originally committed as revision 18530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-15 20:18:02 +00:00
Ronald S. Bultje
30e79845b4 Send dummy requests over the TCP connection (WMS wants GET_PARAMETER,
Real wants OPTIONS) while the connection is idle, otherwise it will
be aborted after a short period (usually a minute). See the thread
"[PATCH] rtsp.c: keep-alive" on the mailinglist.

Originally committed as revision 18525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-15 13:04:34 +00:00
David Conrad
ddd94932fb Ensure that there's pages to read for duration calculation in the ogg demuxer
Originally committed as revision 18523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-15 06:41:08 +00:00
Ronald S. Bultje
e6327fba98 Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC
qualification task, see "RTP/Vorbis payload implementation (GSoC qual
task)" thread on mailinglist.

Originally committed as revision 18509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 15:01:46 +00:00
Ronald S. Bultje
373afbaf76 Increase the SDP buffer size (again!) and also increase the temporary
buffer size of the fmtp parameter buffer. For Vorbis RT(S)P, these
contain full Vorbis headers, which can be up to 12kb each, formatted
in base64, so 16kb total. Patch required for proper Vorbis/RTP playback,
submitted as GSoC qualification task in the thread "RTP/Vorbis payload
implementation (GSoC qual task)" by Colin McQuillan m.niloc googlemail
com.

Originally committed as revision 18508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 13:22:40 +00:00
Stefano Sabatini
fb53b4a035 Rename pbBufPtr() to put_bits_ptr().
The new name is more readable and consistent with the FFmpeg naming
style.

Originally committed as revision 18497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:59:38 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Baptiste Coudurier
b3eab9fb64 seek inside buffer when offset is exactly at the end, fix seeking with memory ByteIOContext
Originally committed as revision 18487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 04:02:51 +00:00
Baptiste Coudurier
1bd280f730 Set frame defaults in try_decode_frame.
Fix:
==22211== Conditional jump or move depends on uninitialised value(s)
==22211==    at 0x811E692: ff_print_debug_info (mpegvideo.c:1137)
==22211==    by 0x82E6A7B: decode_frame (h264.c:7897)
==22211==    by 0x80F2823: avcodec_decode_video2 (utils.c:564)
[...]
==22211==  Uninitialised value was created by a stack allocation
==22211==    at 0x8064AA3: try_decode_frame (utils.c:1845)

Originally committed as revision 18483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 03:38:55 +00:00
Baptiste Coudurier
e472ea34c4 reindent
Originally committed as revision 18480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 03:32:02 +00:00
Baptiste Coudurier
c950c25ac0 remove useless wrapper
Originally committed as revision 18465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 09:04:12 +00:00
Reimar Döffinger
c96495e75c Move ea demuxer messages that are irrelevant to ordinary users from
AV_LOG_INFO to AV_LOG_DEBUG.

Originally committed as revision 18464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:53:22 +00:00
Baptiste Coudurier
7b9677f6b0 remove useless wrapper
Originally committed as revision 18463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:52:16 +00:00
Reimar Döffinger
f28c4e756f Slightly improve/correct description of wc3_pal_lookup
Originally committed as revision 18462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:49:20 +00:00
Stefano Sabatini
b275500706 Split bitstream.h, put the bitstream writer stuff in the new file
put_bits.h.

Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:35:26 +00:00
Michael Niedermayer
77daaf6748 Disable metadata reading. Yes, I would like to know what this code is good for
and this is the easiest way to. It would be a lot of messy code we can drop
if it is useless.
As a sideeffect this fixes issue977.

Originally committed as revision 18460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 04:01:03 +00:00
Baptiste Coudurier
ebcf352a25 replace DEBUG_SI with DEBUG and use dprintf
Originally committed as revision 18458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 03:08:46 +00:00
Baptiste Coudurier
495b37664d Set stream type to ac3 if registration descriptor is present.
Based on patch by Nico Sabi, nicola dot sabbi at poste dot it

Originally committed as revision 18457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 02:39:16 +00:00
Baptiste Coudurier
4f1db48e88 simplify registration descriptor parsing with bytestream get functions
Originally committed as revision 18456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 02:32:02 +00:00
Björn Axelsson
a4d2af9b96 Ok, ts demuxer is more complicated than I thought
Revert r18454 and fix correctly #700
Stop parsing if end of buffer is reached while reading
patch by Björn Axelsson, bjorn dot axelsson at intinor dot se

Originally committed as revision 18455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 02:19:40 +00:00
Baptiste Coudurier
2b97246ec2 fix end of buffer check, fix hang_read_header.h264.ts
Originally committed as revision 18454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 01:37:34 +00:00
Baptiste Coudurier
a3d23e15fb fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
Originally committed as revision 18453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 00:25:37 +00:00
Reimar Döffinger
d2e63e8b05 Simplify packet duplication code in ff_interleave_add_packet.
Behaviour only changes if pkt->destuct neither av_destruct_packet,
av_destruct_packet_nofree nor NULL, in which case the new code avoids a double free.

Originally committed as revision 18452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 22:38:00 +00:00
Reimar Döffinger
7ce0420983 Fix "unrecognized WC3 chunk" debug output which was broken r18444 due to sign expansion.
Originally committed as revision 18450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 21:45:57 +00:00
Reimar Döffinger
cfb9b3550b wc3movie: return partial packets if not all data can be read.
This is consistent with other demuxer's behaviour and avoids a memleak.
It also returns the error from av_get_packet instead of always AVERROR(EIO).

Originally committed as revision 18446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 20:48:56 +00:00
Reimar Döffinger
cdbe3798d2 Explain the purpose of the wc3_pal_lookup and the formula that was used to
calculate it.

Originally committed as revision 18445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 20:08:16 +00:00
Reimar Döffinger
f6a708f092 Use get_le32/get_be32 in wc3movie demuxer instead of reading everything into
a buffer first.

Originally committed as revision 18444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 18:58:55 +00:00
Reimar Döffinger
80d403fc19 Get rid of av_destruct_packet_nofree and use NULL instead.
It is still used in comparisons to keep ABI compatibility.

Originally committed as revision 18431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 12:42:29 +00:00
Reimar Döffinger
46e97dc3c2 Reindent
Originally committed as revision 18429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 10:41:06 +00:00
Reimar Döffinger
f772b7fa7d Make electronicarts demuxer return partial frames, this is the default
behaviour of av_get_packet and should not be override without good reason.
As a side effect this fixes the memleak described in issue 956.
Also return the exact error code from av_get_packet instead of AVERROR(EIO).

Originally committed as revision 18428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 10:38:56 +00:00
Diego Biurrun
cc7b62afd2 Replace rand() usage by av_lfg_get().
Originally committed as revision 18420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 17:12:36 +00:00
Diego Biurrun
a2085cccfa cosmetics: Align output columns.
Originally committed as revision 18419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 15:16:11 +00:00
Aurelien Jacobs
ed54ae08b8 remove useless duplication of what av_new_stream() already does
Originally committed as revision 18416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:49:53 +00:00
Thilo Borgmann
0dccbba02c Add 'PNG1' to PNG fourcc codes.
Patch by Thilo Borgmann thilo DOT borgmann _AT_ gXXglemail.cXm.

Originally committed as revision 18415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:18:04 +00:00
Thilo Borgmann
655d47c2cb Make try_decode_frame() use the new avcodec_decode_* API.
Patch by Thilo Borgmann thilo.borgmann AT g00glemail dot com.

Originally committed as revision 18408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 11:03:06 +00:00
Luca Abeni
9331967007 AAC packetiser cleanup: use consts instead of #defines
Originally committed as revision 18402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 21:48:45 +00:00
Luca Abeni
ddffcb2d3a AAC packetiser cleanup: remove check for a condition that cannot happen
Originally committed as revision 18401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 21:39:07 +00:00
Martin Storsjö
d2ce53b786 Fix two checks in the AAC packetiser, which were too conservative
Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 21:37:11 +00:00
Reimar Döffinger
ef12ec23fa Fix memleak in nuv demuxer: free packet already allocated packet when
returning an error in nuv_packet.

Originally committed as revision 18385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 14:16:22 +00:00
Reimar Döffinger
9470511185 Correctly set packet size for partial video packets in nuv demuxer.
Originally committed as revision 18379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 20:20:42 +00:00
Reimar Döffinger
feb993e579 Add av_shrink_packet function for use in av_get_packet that reduces pkt->size
and ensures the following padding is correctly initialized to 0.

Originally committed as revision 18378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 20:19:12 +00:00
Zhentan Feng
c81604f862 Reduce code duplication.
Patch by Zhentan Feng, spyfeng gmail

Originally committed as revision 18377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 16:01:10 +00:00
Martin Storsjö
08e696c0b2 Add support for AMR audio in the RTP muxer
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 07:16:14 +00:00
Baptiste Coudurier
17ad7b24c8 force sample for qcelp when not stored in mov, fix #968
Originally committed as revision 18374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 03:38:59 +00:00
Ronald S. Bultje
4bce3ba480 Reindent after r18372.
Originally committed as revision 18373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 03:06:08 +00:00
Ronald S. Bultje
6e9f56c127 Add waveformat-extensible support in the wav muxer.
Patch (GSoC qualfication task) by Zhentan Feng spyfeng gmail com, see
"[FFmpeg-devel] Add waveformat extensible support in wav muxer (SoC
qualification task)" thread on mailinglist.

Originally committed as revision 18372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 03:04:57 +00:00
Baptiste Coudurier
3c8d144789 move codec tag tables near corresponding code
Originally committed as revision 18370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:34:05 +00:00
Baptiste Coudurier
08680ab8c2 cosmetics, reindent
Originally committed as revision 18369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:31:53 +00:00
Baptiste Coudurier
0872acc45c cosmetics, add empty line and remove useless braces
Originally committed as revision 18368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:31:17 +00:00
Baptiste Coudurier
b6cb99469f fix compilation, add missing parenthesis
Originally committed as revision 18367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:28:39 +00:00
Baptiste Coudurier
130ba4b17a comment the ipod subtitle check
Originally committed as revision 18366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:26:47 +00:00
Baptiste Coudurier
6452af7a33 invert condition to simplify code
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:25:11 +00:00
Baptiste Coudurier
cf9ce6a3d6 remove no more needed code, tag is set by default
Originally committed as revision 18364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:23:15 +00:00
Baptiste Coudurier
2ab57c0443 cosmetics, reindent, add empty lines
Originally committed as revision 18363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:21:43 +00:00
Baptiste Coudurier
6b60028595 split mov_find_codec_tag in separate per format functions
Originally committed as revision 18362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:19:58 +00:00
Reimar Döffinger
b0723c8a12 Always return 0 if read_packet is successful.
Originally committed as revision 18360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 21:25:02 +00:00
Reimar Döffinger
ac2b2226ac Do not uselessly read version string into a buffer.
Originally committed as revision 18359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 21:16:11 +00:00
Reimar Döffinger
6883ebe4b9 Describe read_alloc return value and required pkt handling to avoid memleaks
Originally committed as revision 18358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 21:10:10 +00:00
Reimar Döffinger
4e5735f774 Error out also when reading nuv header returns with partial data and return
AVERROR(EIO) then.

Originally committed as revision 18357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:52:37 +00:00
Baptiste Coudurier
2fa6bc789f set bits_per_coded_sample for rawvideo
Originally committed as revision 18356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:47:56 +00:00
Baptiste Coudurier
50d2d05d34 override mov fourcc for pcm audio, this is safer when stream copying
Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:37:30 +00:00
Thilo Borgmann
cdd8930e6a Move av_packet_*() functions from libavformat/ to libavcodec/, where the
AVPacket structure now resides also.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see the mailinglist
thread "Google Summer of Code participation" for additional discussion.

Originally committed as revision 18353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 18:31:14 +00:00
Aurelien Jacobs
b02d3aef94 use av_freep() instead of av_free() + =NULL.
Originally committed as revision 18349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 12:31:28 +00:00
Luca Abeni
0f55f341fe Fix the copyright year
Originally committed as revision 18348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 12:28:41 +00:00
Martin Storsjö
9edfaf3c6c Add support for H.263 video in the RTP muxer
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 06:41:55 +00:00
Luca Abeni
215037887d Do not return payload type 34 for H.263 (it is deprecated)
Originally committed as revision 18346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 06:37:12 +00:00
Martin Storsjö
99f373f3a6 Only insert the SPS and PPS NALs in sprop-parameter-sets
Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-06 21:04:26 +00:00
Michael Niedermayer
634b927f82 Do not fail on zero packets.
Originally committed as revision 18328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-03 15:32:31 +00:00
Olivier Guilyardi
80ff8a16f5 Implement JACK input device.
Patch by Olivier Guilyardi list samalyse com.
See the thread: "[FFmpeg-devel] [PATCH] libavdevice: JACK demuxer".

Originally committed as revision 18322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 23:53:47 +00:00
Thilo Borgmann
fabd2469f1 Move AVPacket declaration from avformat.h to avcodec.h.
Patch by Thilo Borgmann thilo dot borgmann at googlemail _dot_ com.

Originally committed as revision 18317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 19:53:53 +00:00
Jai Menon
3dd2f87e61 Map MOV fourcc YUV2 correctly to PIX_FMT_YUYV422.
Patch by Jai Menon

Originally committed as revision 18316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 12:15:04 +00:00
Reimar Döffinger
3dd3604197 Reindent
Originally committed as revision 18315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:27:14 +00:00
Reimar Döffinger
fb9ac65411 Support DVD subtitles in mov/mp4 as created by Nero.
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4

Originally committed as revision 18314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:26:46 +00:00
Baptiste Coudurier
fcb4228c86 skip empty data packets in flv, fix input.flv
Originally committed as revision 18306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 03:52:19 +00:00
Måns Rullgård
33afad5451 Add $(ELIBS) to example/test app link command
Originally committed as revision 18298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:34 +00:00
Måns Rullgård
bbba084b4f Make examples and test progs depend on libraries
Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:31 +00:00
Ben Littler
13b47b4012 add another dv fourcc CDVH
Originally committed as revision 18293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:45:28 +00:00
Aurelien Jacobs
b89894abb7 matroska: add support for MLP and TRUEHD codec tags
Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 21:37:04 +00:00
Diego Biurrun
bbbb885626 Fix timefilter test program build without previously building libavformat.
The test program depends on symbols from this library.

Originally committed as revision 18247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 13:09:44 +00:00
Diego Biurrun
43a0cb7ca2 Generalize example target rule in common.mak so that it sets a -example$(EXESUF)
suffix for all example files instead of doing this in individual Makefiles.

Originally committed as revision 18217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 14:35:20 +00:00
Ronald S. Bultje
be0395103a Don't strip the first three characters off of any metadata in ASF file.
See "[FFmpeg-devel] [PATCH] asf fix" thread. Patch contributed by
David DeHaven <dave sagetv com>.

Originally committed as revision 18213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-28 03:54:31 +00:00
Luca Abeni
0766c3ee98 Make rtp_write_header() fail in case of unsupported payload type
Originally committed as revision 18204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-27 21:36:44 +00:00
Diego Biurrun
5b00e88bb2 Move output-example dependency declaration after subdir.mak include so that it is
not the first (and thus default) target and output-example is not always built.

Originally committed as revision 18203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-27 17:06:39 +00:00
Diego Biurrun
d95a0c67ae Move output_example.c --> libavformat/output-example.c.
The libavformat directory is a better place for a libavformat API example.

Originally committed as revision 18199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-27 00:01:06 +00:00
Ramiro Polla
d4efacff64 Use intptr_t when casting pointers to int.
Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-26 01:34:02 +00:00
Diego Biurrun
7304c2c4ce Move adding the '-test$(EXESUF)' suffix to test programs into common.mak.
Originally committed as revision 18189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 18:19:20 +00:00
Baptiste Coudurier
f03a081df0 set wrong_dts for iMovie created files which has huge ctts delay, fix ffmpeg_sample.m4v
Originally committed as revision 18181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 06:07:13 +00:00
Ronald S. Bultje
da1e126e0d strchr(string, '\0') returns non-NULL, and is thus not suited for use in
redir_isspace(char) to check if '\0' is a space or not. Therefore, we now
use memchr(), since then we can give the length of the string (i.e. the
length excluding the terminating '\0'). Fixes issue 919, see also the
follow-ups in the "[PATCH] rtsp.c small cleanups" mailinglist thread.

Originally committed as revision 18177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-24 03:24:59 +00:00
Diego Biurrun
661ce28996 Rename 'tests' target to 'testprogs'. It is too easily confused with the
'test' target and a directory named tests exists.

Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 23:13:21 +00:00
Aurelien Jacobs
bd51c0138a handle id3v2 'genre' tag formated as '%d'
Originally committed as revision 18145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 16:10:37 +00:00
Ronald S. Bultje
2121b160d5 Remove alpha channel from default colorspace tables, since it is unused. See
"qtpalette.h" thread on mailinglist.

Originally committed as revision 18144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 13:05:13 +00:00
Ronald S. Bultje
e6b09f4361 Add a @todo with a comment from Kostya so we don't forget to optimize that at
some point in the future.

Originally committed as revision 18142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 12:47:16 +00:00
Kostya Shishkov
c21fbefb9d Add AURA 1 and 2 codec IDs and register their FOURCCs
Originally committed as revision 18141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 07:40:22 +00:00
Baptiste Coudurier
5c5776e10d allocate tracks instead of using MAX_STREAMS
Originally committed as revision 18140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 03:52:55 +00:00
Baptiste Coudurier
08a5b4e9b5 since code now use get_bits_long, allocate padding buffer
Originally committed as revision 18138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 02:47:35 +00:00
Baptiste Coudurier
5f01c1258f avoid creating a new stream not referenced in pmt since it cannot be associated to a program, fix issue 835
Originally committed as revision 18137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 02:04:28 +00:00
Baptiste Coudurier
a0dd3c0039 reset codec width/height for h264 forcing decoder to parse extradata
Originally committed as revision 18134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 23:29:34 +00:00
Ronald S. Bultje
cc9aced32f Remove slash-skipping code because the function called right after that
statement (get_word_sep()) already does that all by itself. See summary in
"[PATCH] rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 21:02:08 +00:00
Ronald S. Bultje
78f731de92 Reindent something where a if () --> { <-- is on a newline rather than on the
same line as the if. See summary in "[PATCH] rtsp.c small cleanups" thread on
mailinglist.

Originally committed as revision 18127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 21:00:51 +00:00
Ronald S. Bultje
7d09a993d1 Free metadata if already allocated; fixes a memleak if the header occurs twice
in a stream (e.g. malicious input, broken file, etc.). See summary in "[PATCH]
rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:59:59 +00:00
Ronald S. Bultje
6a8c8b36b9 Fix silly bug in hex_to_data() where it compares a string pointer for whether
it is '\0' rather than its content (char *p; if (p == '\0') instead of if
(*p == '\0')). See summary in "[PATCH] rtsp.c small cleanups" thread on
mailinglist.

Originally committed as revision 18125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:58:41 +00:00
Ronald S. Bultje
64917dd3df Remove useless comment about something that is deprecated. See summary in
"[PATCH] rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:56:57 +00:00
Ronald S. Bultje
36aa7bc27f Use skip_spaces() in the "redir" demuxer instead of "while (isspace(&p)) p++".
See summary in "[PATCH] rtsp.c small cleanups" thread on mailinglist.

Originally committed as revision 18123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:55:52 +00:00
Ronald S. Bultje
1ef36a7035 Merge functional code from get_word() and get_word_sep() into a single
function, since they both do approximately the same thing. At the same time,
remove redir_isspace() altogether since code elsewhere (including
get_word_sep()) uses strchr() for the same purpose. See summary in "[PATCH]
rtsp.c small cleanups" thread.

Originally committed as revision 18122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:54:47 +00:00
Ronald S. Bultje
7e726132c2 Allow (and parse) incoming server messages (notices) interleaved with TCP
data packets or in addition to UDP data packets, over the RTSP/TCP connection.
See discussion in [PATCH] rtsp.c: read TCP server notifications/messages"
thread on mailinglist.

Originally committed as revision 18121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:46:36 +00:00
Ronald S. Bultje
9c610b7667 Add a @todo item to use ByteIOContext instead of URLContext at some point in
the future, requested by Luca in "[PATCH] rtsp.c: read TCP server
notifications/messages" thread.

Originally committed as revision 18120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:44:46 +00:00
Ronald S. Bultje
8b9794e542 Remove index writing in RM muxer, since it is broken (multiple streams per
single index chunk) and is always empty anyway. See "[PATCH] rmenc.c: remove
index writing" thread.

Originally committed as revision 18119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 20:34:24 +00:00
Ronald S. Bultje
83c0ba3dad Don't allow to sync on packets of zero-size length, since these are never
valid. See "[PATCH] rmdec.c: prevent zero-length packets" thread.

Originally committed as revision 18118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 19:19:09 +00:00
Ronald S. Bultje
e75e603c1a Move "- 12" statement up a bit. See "[PATCH] rmdec.c: prevent zero-length
packets" thread.

Originally committed as revision 18117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 19:18:07 +00:00
Daniel Verkamp
e1dc16ae56 Make Smacker audio decoder output audio in original bit depth
Patch by Daniel Verkamp
($firstname) at (three-letter file extension for drivers in Win 3.1) dot (nu)

Thread: [PATCH] Smacker: Output audio in original bit depth

Originally committed as revision 18111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 15:52:14 +00:00
David Conrad
1a4ab332c6 Reindent
Originally committed as revision 18102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 08:22:36 +00:00
David Conrad
6e6abd0237 Fix Speex header parsing in ogg demuxer
Originally committed as revision 18101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 08:22:09 +00:00
David Conrad
1fa9726cf6 Document ogg_codec's header function
Originally committed as revision 18100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 08:03:30 +00:00
Baptiste Coudurier
be2a6e2f82 fix compilation when DEBUG_SEEK is defined
Originally committed as revision 18099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 07:36:25 +00:00
Baptiste Coudurier
92a0f33878 fix valid seeking range
Originally committed as revision 18098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 07:35:52 +00:00
Baptiste Coudurier
b4800b8b7d protect realloc overflow
Originally committed as revision 18088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 00:50:51 +00:00
Justin Ruggles
29b0d168e6 seek backwards 4 bytes if 'fLaC' marker is not found
Originally committed as revision 18086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 00:49:14 +00:00
Daniel Verkamp
effcedf738 PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.
Patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 17:23:45 +00:00
Baptiste Coudurier
7c45723a98 resync ffm if error in stream
Originally committed as revision 18065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:44:45 +00:00
Baptiste Coudurier
21c6438f2c typo, fix eof check
Originally committed as revision 18064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:39:55 +00:00
Baptiste Coudurier
b9edbe9953 do not write ffm write index by default, detect if file is being written and return EOF
Originally committed as revision 18063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:23:33 +00:00
Ronald S. Bultje
cf16c17a69 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
try #2" thread. Patch originally by Vladimir Voroshilov.

Originally committed as revision 18062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:22:51 +00:00
Ronald S. Bultje
e9fce261a6 Assign the x-pf-asf payload string to be decoded by rtp_asf.c, and add a
SDP line handler that parses the streamID in the SDP so that ASF stream
data can be matched to their respective streams in the RTSP demuxer. See
"[PATCH] RTSP-MS 12/15: ASF payload support" thread on mailinglist.

Originally committed as revision 18061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 01:11:08 +00:00
Baptiste Coudurier
876578914b set avi fsize to INT64_MAX if riff tag end is not set and file size is not available
Originally committed as revision 18052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:57:14 +00:00
Baptiste Coudurier
3a5601885b move max analyze duration check before considering new packet
Originally committed as revision 18051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:54:34 +00:00
Ramiro Polla
23d9cc4563 Support raw TrueHD files
Originally committed as revision 18049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:46:56 +00:00
Ramiro Polla
9ba4821d93 Split TrueHD decoder from MLP
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:23:39 +00:00
Alex Converse
5c3d507f1a MOV: Use the AOT enum for the mp4_audio_types mapping.
Originally committed as revision 18044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 18:13:42 +00:00
Reimar Döffinger
b8b00d9429 Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
(GUID is also defined, but differently, in Windows headers).

Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-18 14:03:40 +00:00
Reimar Döffinger
4d0c3dc0d5 Add a special guidcmp function to compare ASF guids, to avoid the many
duplicated sizeof(GUID).

Originally committed as revision 18030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-18 13:17:23 +00:00
Ronald S. Bultje
79ff11d78f Fix wrong @file tag.
Originally committed as revision 18026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-17 18:35:58 +00:00
Ronald S. Bultje
c4a3d03299 Reindent after r18023.
Originally committed as revision 18024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-17 12:35:55 +00:00
Ronald S. Bultje
1a30d5415f Add RTP/ASF header parsing, which is part of the SDP of these streams. See
patch discussion in "[PATCH] RTSP-MS 10/15: ASF header parsing" thread.

Originally committed as revision 18023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-17 12:34:57 +00:00
avcoder
6d050dd673 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com
Originally committed as revision 18022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-17 12:27:32 +00:00
Reimar Döffinger
2ac736a6da Extend mov edit list support to work for a first padding entry with
time == -1 and duration. Complicated since time is relative to stream,
duration relative to container time base.

Originally committed as revision 18019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 20:49:52 +00:00
Måns Rullgård
c3df4a3bfe rmdec: fix crash at end of file
Originally committed as revision 18018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 20:22:39 +00:00
Alex Converse
d0dab0ecd4 Cosmetics: Re-indent after last commit
Originally committed as revision 18017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 16:24:38 +00:00
Alex Converse
bd27eed6d0 MOV: Support stz2 "Compact Sample Size Box"
Originally committed as revision 18016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 16:14:36 +00:00
Ronald S. Bultje
508fe07ab3 More reindent, forgotten in previous commit.
Originally committed as revision 18014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 13:23:29 +00:00
Ronald S. Bultje
2d6f301470 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
Has been tested against streamed / non-seekable input and passes make
seektest. See "[PATCH] rmdec.c: parse INDX chunk" thread on mailinglist.

Originally committed as revision 18013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 13:03:23 +00:00
Ronald S. Bultje
c882927957 Reindent after r18010.
Originally committed as revision 18011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 13:01:02 +00:00
Ronald S. Bultje
55d330f913 Mark the first output audio frame as keyframe (separate patch from previous,
as requested by Kostya). See "[PATCH] rmdec.c: remove cache access
duplication".

Originally committed as revision 18010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:59:18 +00:00
Ronald S. Bultje
c5efef7be9 Remove packet returning in ff_rm_parse_packet() if we're using the packet
cache, since this can already be accessed through ff_rm_retrieve_cache().
See "[PATCH] rmdec.c: remove cache access duplication" thread.

Originally committed as revision 18009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:57:49 +00:00
Ronald S. Bultje
7268f0bd8e Reindent after r18005.
Originally committed as revision 18007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:50:12 +00:00
Ronald S. Bultje
6a2d3fc30b Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
the newer (.rm, audio/video) files. See "[PATCH] rmdec.c: merge old/new
packet reading code" thread on mailinglist.

Originally committed as revision 18005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:47:34 +00:00
Baptiste Coudurier
f05783c2db cosmetics, remove useless braces
Originally committed as revision 18004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:57 +00:00
Baptiste Coudurier
9bf1b2683c simplify printing
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:28 +00:00
Baptiste Coudurier
f584386d54 reindent
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:44:16 +00:00
Baptiste Coudurier
c6026e4360 fix trkn metadata parsing
Originally committed as revision 18001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:43:38 +00:00
Baptiste Coudurier
0fb44a4e47 move read_udta_string up to avoid forward declaration
Originally committed as revision 18000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:06:05 +00:00
Baptiste Coudurier
873358e5d4 more generic metadata handling
Originally committed as revision 17999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:03:29 +00:00
Baptiste Coudurier
2229a5c60e do not set isom if ctype is not set, happens in mov
Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 05:13:55 +00:00
Baptiste Coudurier
df8843c65f search for hdlr atom in meta, some files do not store version+flags
Originally committed as revision 17996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 23:54:53 +00:00
Ronald S. Bultje
7a160bca83 Fix index generation in the way that it was supposed to be used. See the
discussion in the ML thread "[PATCH] rmdec.c: merge old/new packet reading
code".

Over time, this code broke somewhat, e.g. seq was never actually written
into (and was thus always 1, therefore the seq condition was always true),
whereas it was supposed to be set to the sequence number of the video slice
in case the video frame is divided over multiple RM packets (slices). The
problem of this is that packets other than those containing the beginning
of a video frame would be indexed as well.
Secondly, flags&2 is supposed to be true for video keyframes and for these
audio packets containing the start of a block. For some codecs (e.g. AAC),
that is every single packet, whereas for others (e.g. cook), that is the
packet containing the first of a series of scrambled packets that are to be
descrambled together. Indexing any of the following would lead to incomplete
and thus useless frames. Problem here is that flags would be reset to 2 to
indicate that the first packet is ready to be returned, and in addition if
no data was left to be returned (which is always true for the first packet),
then we wouldn't actually write the index entry anyway.
All in all, the idea was good and it probably worked at some point, but that
is long ago. This patch should at the very least make it likely for this code
to be executed again at the right times, i.e. the way it was originally
intended to be used.

Originally committed as revision 17993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 20:14:25 +00:00
Baptiste Coudurier
7c4502c8c4 typo in the mail, the 4am commit is always the worst
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:53:12 +00:00
Baptiste Coudurier
4909e517fd cosmetics
Originally committed as revision 17980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:52 +00:00
Baptiste Coudurier
983bdd3788 add my copyright in mov de/muxer
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:28 +00:00
Baptiste Coudurier
e49da8273b allocate palette in codec directly
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:44:57 +00:00
Baptiste Coudurier
6c00a9dec2 cosmetics, add some whitespaces and empty lines
Originally committed as revision 17975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:06:36 +00:00
Baptiste Coudurier
f0f2218dce do not modify sample_count, check against index entries
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 07:21:22 +00:00
Baptiste Coudurier
ed6ae6a58b use utc time for timestamp and do not set it if not specified
Originally committed as revision 17971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 23:39:52 +00:00
Baptiste Coudurier
36a12218db swf timestamps are 16 bits
Originally committed as revision 17969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:51:38 +00:00
Baptiste Coudurier
40a1d41fd2 remove unused fields in swf context
Originally committed as revision 17968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:49:01 +00:00
Baptiste Coudurier
2261a952f9 do not parse timestamp if bitexact is set, should fix regression tests
Originally committed as revision 17967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:43:28 +00:00
Reimar Döffinger
881dad9e76 Enable generic index creation and seeking for NUV demuxer.
Originally committed as revision 17966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:07:15 +00:00
Reimar Döffinger
74f5ae847d Add AVFMT_GENERIC_INDEX support also for formats that do not use a parser.
Originally committed as revision 17965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 21:46:00 +00:00
Reimar Döffinger
bd36f175ab Make pcm_read_seek treat negative time stamps as 0, this avoids incorrectly
seeking before data_offset and is more consistent with how the generic index
seeking code handles it.

Originally committed as revision 17964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 20:50:54 +00:00
Michael Niedermayer
85b4230f68 Do not lose user flags when passing calls from the new to the old seeking API.
Originally committed as revision 17959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 16:30:51 +00:00
Michael Niedermayer
32d885926d add avformat_seek_file()
Originally committed as revision 17956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 15:51:46 +00:00
Reimar Döffinger
7e04cfba27 Set pkt->pos correctly (to the start of header of the packet) in swfdec.
Originally committed as revision 17953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 22:26:45 +00:00
Baptiste Coudurier
4e35ffa978 fix swf seeking by fixing new stream detection
Originally committed as revision 17952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 19:37:05 +00:00
Reimar Döffinger
abb785f19e Simplify RoQ demuxer pts calculation by using a appropriate time bases.
Originally committed as revision 17946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 13:37:35 +00:00
Reimar Döffinger
15969b55d1 Set video width/height and create audio stream in read_packet instead of
pre-parsing the file in read_header.
This avoids some code duplication and seeking, and also avoids an IO error
for small video-only files (as created during e.g. the FATE encoder test).

Originally committed as revision 17945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-12 11:47:50 +00:00
Baptiste Coudurier
d168b3fd2d reindent
Originally committed as revision 17940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:05:18 +00:00
Baptiste Coudurier
7943a90a0d keep original tag when stream copying subs with ipod format
Originally committed as revision 17939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:04:44 +00:00
Baptiste Coudurier
c569bd0632 ipod supports both subs tags
Originally committed as revision 17938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:03:42 +00:00
Baptiste Coudurier
80357cfcfb reindent
Originally committed as revision 17937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:02:59 +00:00
Baptiste Coudurier
9f52055463 write correct atoms based on tag and not format, fixes subs stream copy
Originally committed as revision 17936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:01:39 +00:00
Baptiste Coudurier
d1df4da00b use correct codec tag list for ipod format
Originally committed as revision 17935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:59:38 +00:00
Baptiste Coudurier
f344ae8096 again 10l, typo, put_byte instead of put_buffer
Originally committed as revision 17933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:48:02 +00:00
Baptiste Coudurier
cafdc1876a attempt to try to generate an random umid
Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:15:00 +00:00
Baptiste Coudurier
a2523ce2e2 fix subs track height, set track->height to codec height if not set
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:04:56 +00:00
Ben Littler
3596f4e076 sn40 avi fourcc decodes with ffodivx
Originally committed as revision 17928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 01:36:25 +00:00
Ronald S. Bultje
b5b9ff2a1f Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
and if the size is broken (20 bytes, header-only), calculate the expected
size and skip the index entries anyway. See "[PATCH] rmdec.c: correctly
skip indexes" thread.

Originally committed as revision 17924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-10 12:55:29 +00:00
Ronald S. Bultje
b8cc5a9fdf Prevent (negative) overflow of rm->remaining_len. This evaluation really only
has two possible outcomes: either len and rm->remaining_len are the same, in
which case we care about the outcome and it is zero, or rm->remaining_len is
currently not in use and we don't care about the outcome. In that case, len
is positive and rm->remaining_len is zero, which leads to a negative result.
This is confusing and could eventually lead to a sign-flip if we skip a lot
of packets (unlikely, but still). Therefore, just always set it to zero.

Originally committed as revision 17919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 22:03:47 +00:00
Ronald S. Bultje
7ccefd08f6 Revert to r17908.
Originally committed as revision 17918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 22:02:06 +00:00
Ronald S. Bultje
88c4339bda Move MOVContext and related structures from mov.c to isom.h. See "[PATCH]
move MOVContext from mov.c to isom.h" thread on ML.

Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 21:53:00 +00:00
Reimar Döffinger
3898eed890 Reorder arguments for av_fifo_generic_read to be more logical and
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 17:47:47 +00:00
Ronald S. Bultje
0ecf9cc900 Prevent (negative) overflow of rm->remaining_len. This evaluation really only
has two possible outcomes: either len and rm->remaining_len are the same, in
which case we care about the outcome and it is zero, or rm->remaining_len is
currently not in use and we don't care about the outcome. In that case, len
is positive and rm->remaining_len is zero, which leads to a negative result.
This is confusing and could eventually lead to a sign-flip if we skip a lot
of packets (unlikely, but still). Therefore, just always set it to zero.

Originally committed as revision 17910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 13:08:19 +00:00
Ronald S. Bultje
21b3752932 Replace separate packet parsing for "old_format" .ra files by a call to
ff_rm_parse_packet(). See "[PATCH] Make RM demuxer behave better with -an
option" thread, which sort-of turned into an aggregate of unrelated rmdec.c
cleanups.

Originally committed as revision 17909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:46:32 +00:00
Ronald S. Bultje
dc3685e129 Move frame discarding out of the ff_rm_parse_packet() loop, and respect
rm->audio_pkt_cnt in case multiple packets should be read before the next
syncpoint in the file, so that ffplay -an on a file containing AAC audio
works. See "[PATCH] Make RM demuxer behave better with -an option" thread
on mailinglist.

Originally committed as revision 17908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:42:53 +00:00
Reimar Döffinger
d71d64dcc1 Mark all packets from nuv demuxer as keyframes in order to make seeking work.
For proper seeking, they should be set correctly though.

Originally committed as revision 17907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:25:13 +00:00
Reimar Döffinger
3a4f91f5ed 100l, to start reading from the first frame we must seek to data_offset,
not 0 in av_seek_frame_generic.

Originally committed as revision 17905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:06:31 +00:00
Reimar Döffinger
fb2e95c97a Set AVPacket pos also for audio packets in nuv demuxer.
Originally committed as revision 17904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 11:35:59 +00:00
Baptiste Coudurier
af79f1ae78 reindent
Originally committed as revision 17898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 04:17:12 +00:00
Baptiste Coudurier
6b4fab72df change path pattern to be similar to existing files, and remove useless buffer
Originally committed as revision 17896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 03:34:15 +00:00
Baptiste Coudurier
4070629dfa merge struct declaration and definition
Originally committed as revision 17895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 02:49:47 +00:00
Baptiste Coudurier
0c8f772791 write map packet every 100 packets according to specs
Originally committed as revision 17894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 02:47:32 +00:00
Baptiste Coudurier
aaa43de31a write flt packet, might need some tweaking but it works
Originally committed as revision 17893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 01:35:00 +00:00
Baptiste Coudurier
a96b1a903a correctly interleave audio and video according to specs
Originally committed as revision 17892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 01:10:28 +00:00
Baptiste Coudurier
46a7e3ec14 write timecode track in gxf
Originally committed as revision 17890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 00:14:55 +00:00
Baptiste Coudurier
33605366ee compute media info in write_header
Originally committed as revision 17889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 22:23:44 +00:00
Baptiste Coudurier
cd34fd9c8c factorize write packet
Originally committed as revision 17888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 22:14:26 +00:00
Baptiste Coudurier
990287c468 remove unneeded and empty user data
Originally committed as revision 17886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 22:12:56 +00:00
Baptiste Coudurier
6b43d2d075 uniformize variable names and remove duplicating fields in private structs
Originally committed as revision 17884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 21:55:08 +00:00
Baptiste Coudurier
8b9c94e0bd remove useless fields
Originally committed as revision 17883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 21:08:06 +00:00
Reimar Döffinger
c957c85426 Replace all uses of the replaced av_fifo_read by av_fifo_generic_read
Originally committed as revision 17873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 14:42:11 +00:00
Michael Niedermayer
41dd680dd8 Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
Yes this breaks ABI/API but ive already broken it and will bump avutil major
soon.

Originally committed as revision 17869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 14:16:55 +00:00
Vitor Sessak
616e899c43 VQF demuxer
Originally committed as revision 17866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-07 22:42:09 +00:00
Ronald S. Bultje
743b389074 rtpmap is case-insensitive, see comment from Luca in "[PATCH] rtsp.c:
keep-alive" thread.

Originally committed as revision 17862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-07 15:20:55 +00:00
Alex Converse
496dcbbc86 ADTS: Increased protection against writing illegal/nonsense files.
Originally committed as revision 17859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 21:19:16 +00:00
Michael Niedermayer
8507bde0f3 Add my name to copyright & author as requested by the original author.
Originally committed as revision 17858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 20:51:50 +00:00
Michael Niedermayer
8b2fa9659a Add code to the self test to print jitter & drift.
Originally committed as revision 17857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 20:48:31 +00:00
Ronald S. Bultje
57f94f54c4 Oops, very silly typo.
Originally committed as revision 17853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 03:12:33 +00:00
Justin Ruggles
f48b9304cd flacdec: Parse the metadata header in the raw FLAC demuxer.
Originally committed as revision 17852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 01:31:10 +00:00
Diego Biurrun
e0c98063e7 Add '#undef rand' to fix test program build.
Originally committed as revision 17850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:57:26 +00:00
Diego Biurrun
6d16718e5d cosmetics: Fix test program warnings.
Originally committed as revision 17849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:55:50 +00:00
Michael Niedermayer
bc3057f499 Vertical align.
Originally committed as revision 17847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:48:02 +00:00
Michael Niedermayer
2e51dedd24 Better name for integrator2_state.
Originally committed as revision 17846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:47:16 +00:00
Michael Niedermayer
3228491027 Add clock_period parameter, this should make the code easier to use.
Originally committed as revision 17845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:44:12 +00:00
Michael Niedermayer
1b85ec1ea2 Selftest code.
Originally committed as revision 17844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:26:51 +00:00
Michael Niedermayer
8537591abc Fix bug with time==0 being special.
Originally committed as revision 17843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:23:52 +00:00
Michael Niedermayer
494065ca36 Adapt first factor.
Originally committed as revision 17842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:20:55 +00:00
Michael Niedermayer
55b5859867 Merge ff_timefilter_read() and ff_timefilter_update(), this simplifies API and
avoids calling them in the wrong order.

Originally committed as revision 17841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:14:44 +00:00
Michael Niedermayer
08ffd3708b Allow timespans to vary.
No change in performance if they do not vary.

Originally committed as revision 17840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-06 00:09:14 +00:00
Michael Niedermayer
28e947e458 Reorder operations, 20% improved performance, 1 variable less.
Originally committed as revision 17839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 23:57:42 +00:00
Michael Niedermayer
f982c6d87a Timefilter code by Olivier Guilyardi o list O samalyse o com
Originally committed as revision 17838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 23:45:18 +00:00
Diego Biurrun
e658657528 Mark pos_min and pos_max variables as av_uninit to work around false
positive uninitialized variable warnings.

Originally committed as revision 17826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 19:15:14 +00:00
Diego Biurrun
1aeb55a1de Mark dvdaudio_substream_type variable as av_uninit to work around false
positive uninitialized variable warning.

Originally committed as revision 17825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 19:13:12 +00:00
Ivan Schreter
61c23c155c Pass packet position to the parser, so frame's AVPacket.pos is computed correctly.
Originally committed as revision 17824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 07:36:16 +00:00
Alex Converse
63581eb183 MOV: fix demuxing fragmented files
Originally committed as revision 17803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 07:57:09 +00:00
Mike Melanson
e584914acd Fix a condition that causes an infinite loop, but only when compiled with
gcc 4.2.4 on x86_32. Thanks to Vitor for hunting this down.

Originally committed as revision 17802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 05:40:53 +00:00
Ronald S. Bultje
29b9f58b37 Split rtsp_send_cmd() into two functions, one for the actual sending of the
command and a second, new function to read the reply to this command. This
will make it possible to read server notices that are not in response to a
command in future versions, such as EOS or interrupt notices. See "[PATCH]
rtsp.c: split rtsp_send_cmd() in a send- and a receive-function" thread.

Originally committed as revision 17797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 00:57:37 +00:00
Michael Niedermayer
ded0149948 Replace two 'return AVERROR(EAGAIN);' by continue. The latter are nicer
and the EAGAIN were just added as example not because they made sense.

Originally committed as revision 17783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 20:24:17 +00:00
Alex Converse
fefe43ff2c MOV: fix crash when 'meta' occurs before first 'trak'
Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 18:19:44 +00:00
Ronald S. Bultje
bc8763cda9 Rename "fd1" variable ro "fd". There were previously two variables (fd1 and
fd2) and one was just removed, so naming the other "fd1" is counter-intuitive.
See "[RFC] rtsp.c EOF support" thread.

Originally committed as revision 17780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 17:06:18 +00:00
Ronald S. Bultje
f0a8039464 Add url_get_file_handle(), which is used to get the file descriptor
associated with the I/O handle (e.g. the fd returned by open()). See
"[RFC] rtsp.c EOF support" thread.

There were previously some URI-specific implementations of the same idea,
e.g. rtp_get_file_handles() and udp_get_file_handle(). All of these are
deprecated by this patch and will be removed at the next major API bump.

Originally committed as revision 17779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 17:04:51 +00:00
Ronald S. Bultje
2fea965070 Reindent after r17777.
Originally committed as revision 17778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 16:53:04 +00:00
Ronald S. Bultje
f830c9a487 Make RTSP-MS-over-UDP negotiation work. See "[PATCH] RTSP-MS 8/15: fix
RTSP-MS UDP" thread on mailinglist.

Basically, UDP setup needs to be done in a particular order (first rtx
on two UDP ports (one for RTP, one for RTCP), then the other streams over
one, single port for all of them together). Not doing this correctly results
in a "461" error (invalid transport) during setup.

Originally committed as revision 17777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 16:52:35 +00:00
Ronald S. Bultje
090438cc81 Recognize the "application" data type, which is required for WMS/UDP
sessions.

This type is used in RTP/ASF (served by WMS servers), and is required to
make UDP sessions work, but breaks TCP sessions. Therefore, we disable setup
for application streams in TCP/WMS streams.

See discussion in "[PATCH] RTSP-MS 8/15: fix RTSP-MS UDP" thread.

Originally committed as revision 17776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 16:48:56 +00:00
Benoit Fouet
9aaa2077e5 Add a context to av_log() calls.
Originally committed as revision 17775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 16:19:37 +00:00
Diego Biurrun
fdf119062e Remove deprecated vhook subsystem.
Originally committed as revision 17769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 14:09:10 +00:00
Ronald S. Bultje
f989d39752 Remove size_t cast in setting s->priv_data directly to the (integer) file
descriptor returned by open(). This removes some dubious doublecasts such
as priv_data = (void *) (size_t) some_integer, and is always safe on systems
we care about because sizeof(int)<=sizeof(void*). See comments from Mans and
Michael in "[RFC] rtsp.c EOF support" thread.

Originally committed as revision 17768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:57:09 +00:00
Ronald S. Bultje
eafb17d140 Don't let finalize_packet() touch pkt->stream_index. Instead, let individual
payload handlers take care of that themselves at their own option. What this
patch really does is "fix" a bug in MS-RTSP protocol where incoming packets
are always coming in over the connection (UDP) or interleave-id (TCP) of
the stream-id of the first ASF packet in the RTP packet. However, RTP packets
may contain multiple ASF packets (and usually do, from what I can see), and
therefore this leads to playback bugs. The intended stream-id per ASF packet
is given in the respective ASF packet header. The ASF demuxer will correctly
read this and set pkt->stream_index, but since the "stream" parameter can
not be known to rtpdec.c or any of the RTP/RTSP code, the "st" parameter
in all these functions is basically invalid. Therefore, using st->id as
pkt->stream_index leads to various playback bugs. The result of this patch
is that pkt->stream_index is left untouched for RTP/ASF (and possibly for
other payloads that have similar behaviour).

The patch was discussed in the "[PATCH] rtpdec.c: don't overwrite
pkt->stream_index in finalize_packet()" thread on the mailinglist.

Originally committed as revision 17767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:51:34 +00:00
Ronald S. Bultje
95f03cf31f Reindent after r17764.
Originally committed as revision 17765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:42:16 +00:00
Ronald S. Bultje
f3e71942e7 In the current implementation of rtp_parse_packet(), finalize_packet() is
called for all packets with an internal handler function but only for
non-first packets from dynamic payload parse_packet() handlers. This patch
fixes that. Bug was noticed by Luca in "[PATCH] rtpdec.c: don't overwrite
pkt->stream_index in finalize_packet()" thread.

Originally committed as revision 17764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:41:50 +00:00
Ronald S. Bultje
d176f90387 Reduce allocated length of the HTTP authentication request field buffer, as
noticed by Stefano and Luca in the "[PATCH]RTSP Basic Authentication"
mailinglist thread.

av_base64_encode() was recently changed. The previous implementation required
12 extra bytes (ceil(len(src)/3.)*4+12), whereas the new one is guaranteed to
fit in an exact buffer (ceil(len(src)/3.)*4), plus one extra byte for the
trailing zero. This change fixes no bug, it just slightly decreases the
amount of allocated memory.

Originally committed as revision 17761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:26:17 +00:00
Diego Biurrun
c04920978e cosmetics: Fix indentation.
Originally committed as revision 17756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 12:57:07 +00:00
Benoit Fouet
2fddbb68b6 Add context to some av_log() calls.
Originally committed as revision 17729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 09:28:37 +00:00
Diego Biurrun
0ffbc258aa Change a bunch of codec long_names to be more consistent and descriptive.
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 05:18:33 +00:00
Aurelien Jacobs
827f7e285b deprecate old metadata API
Originally committed as revision 17690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:35:25 +00:00
Aurelien Jacobs
bc718b4720 fix missed usage of old metadata API in mov demuxer
Originally committed as revision 17689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:06:26 +00:00
Aurelien Jacobs
012867f05b use new metadata API in libavformat/utils.c
Originally committed as revision 17687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 15:38:06 +00:00
Aurelien Jacobs
feacba6c26 use new metadata API in r3d demuxer
Originally committed as revision 17686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 15:28:56 +00:00
Aurelien Jacobs
ec26457064 new metadata API is now officially part of public API
Originally committed as revision 17682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:50:03 +00:00
Aurelien Jacobs
95030323d1 simplify metadata conversion and fixes gcc-2.95 at the same time
Originally committed as revision 17681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:29:30 +00:00
Michael Niedermayer
4022fe01a6 Change the timebase of the raw demuxer to one that can represent the ts of fields.
Originally committed as revision 17675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 03:48:35 +00:00
Michael Niedermayer
9e6c124a87 Disable MPEG-1/2 style timestamp calculation for H264. It still randomizes
the timestamps because delay is not known for the first few frames.

Originally committed as revision 17674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 03:17:24 +00:00
Aurelien Jacobs
719e721a14 Add some basic metadata conversion tables for matroska and asf.
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.

Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 00:12:08 +00:00
Aurelien Jacobs
f610a9f284 add a metadata conversion API
Originally committed as revision 17670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 23:34:16 +00:00
Luca Abeni
3aa7ac6dd2 Document ff_rtp_codec_id()
Originally committed as revision 17666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 19:34:50 +00:00
Ivan Schreter
4c6b49bf74 Change TS seeking so it returns position/timestamp of a key frame.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 18:35:53 +00:00
Luca Abeni
d3da8a4565 Fix typo in a comment
Originally committed as revision 17664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 18:23:19 +00:00
Luca Abeni
c3efd98c09 Document ff_rtp_enc_name()
Originally committed as revision 17663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 18:21:43 +00:00
Justin Ruggles
344bcea46d cosmetics: indentation
Originally committed as revision 17662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:31:25 +00:00
Luca Abeni
d3a5794958 Document ff_rtp_get_codec_info()
Originally committed as revision 17661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:24:56 +00:00
Justin Ruggles
81f052cb7d Separate the raw FLAC demuxer from raw.c and put in a new file,
flacdec.c.

Originally committed as revision 17660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:24:46 +00:00
Ronald S. Bultje
2d243fb3fc Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
in mov.c for the demuxer. See "[PATCH] rename movenc.c MOVContext to
MOVMuxContext" thread on the mailinglist.

Originally committed as revision 17659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 16:02:29 +00:00
Måns Rullgård
f166f2f435 Revert "Improve frame rate guessing for streams with two fields per frame."
This reverts r17656, which broke many tests.  Further investigation
is necessary.

Originally committed as revision 17658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 15:15:54 +00:00
Ivan Schreter
5fa61b26f7 Improve frame rate guessing for streams with two fields per frame.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 13:14:46 +00:00
Aurelien Jacobs
73914d56d9 use new metadata API in nut muxer
This is only a straight conversion of current code, so for now, it won't
mux generic metadata. It will only mux Title, Author and Copyright.

Originally committed as revision 17653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 23:12:14 +00:00
Aurelien Jacobs
00798e4563 use new metadata API in nut demuxer
Originally committed as revision 17652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 23:10:34 +00:00
Reimar Döffinger
fe02d9e719 Do not allow standard-frame-rate detection to increase the value of
r_frame_rate by more than 1% over a previously set/detected value.

Originally committed as revision 17641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 14:13:15 +00:00
Reimar Döffinger
03c03afde7 Simplify ipmovie.c pts calculation by using an appropriate time_base.
Originally committed as revision 17639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 10:07:12 +00:00
Benoit Fouet
f3592353ce Add a context to av_log() call.
Originally committed as revision 17638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:31:20 +00:00
Reimar Döffinger
3bc5f6f9a6 Hack: #undef printf so compilation works with DEBUG_IPMOVIE set to 1
Originally committed as revision 17632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:02:34 +00:00
Reimar Döffinger
8514272472 Detect the case when the time base is exact but far finer than necessary to
represent the time stamps, as e.g. for ipmovie.c and set a better r_frame_rate.

Originally committed as revision 17631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 07:56:24 +00:00
Michael Niedermayer
3797c74ba5 Add ticks_per_frame, this should hopefully fix the regressions caused
by the time_base change.

Originally committed as revision 17630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 23:47:32 +00:00
Aurelien Jacobs
83569729d4 cosmetics: vertical alignment
Originally committed as revision 17629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:39:53 +00:00
Aurelien Jacobs
b8222b3d9c use new metadata API in rpl demuxer
Originally committed as revision 17628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:38:46 +00:00
Aurelien Jacobs
0d2e86d7ae use new metadata API in wc3 demuxer
Originally committed as revision 17627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:35:26 +00:00
Stefano Sabatini
3f4c2bf99b Mark as "internal but installed" the avio.h file.
This should prevent its direct inclusion in an external project, which
results broken if avformat.h is not included before.

Originally committed as revision 17626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:34:18 +00:00
Stefano Sabatini
aafe9b635e Add a @file notice to avio.h.
Originally committed as revision 17625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:28:42 +00:00
Aurelien Jacobs
17af052531 move static tables from asf.h to non-static tables in asf.c
this avoid getting those tables duplicated in asfenc.o and asfdec.o

Originally committed as revision 17619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 16:17:17 +00:00
Aurelien Jacobs
5e293c424d rename asf-enc.c to asfenc.c and asf.c to asfdec.c for consistency
Originally committed as revision 17618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 15:44:19 +00:00
Aurelien Jacobs
6352c6bb63 fix a memleak in av_metadata_set()
Originally committed as revision 17617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:40:04 +00:00
Ronald S. Bultje
144ae29dde Implement marker bit, which is used for several RTP payloads currently
under review. See "[FFmpeg-devel] RTP mark bit not passed to parse_packet"
thread on mailinglist.

Originally committed as revision 17616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:24:50 +00:00
Ronald S. Bultje
a68d44ed6f Don't (ab)use PKT_FLAG_* in RTP code, since the two have virtually nothing
in common except for this one value. Change was requested by Luca in the
"[FFmpeg-devel] RTP mark bit not passed to parse_packet" thread.

Originally committed as revision 17615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:23:05 +00:00
Ronald S. Bultje
26d6b3e230 Document rtsp.h, see "[PATCH] document rtsp.h" thread.
Originally committed as revision 17614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:15:41 +00:00
Aurelien Jacobs
d9fc9ff31b movenc: add muxing of language along with metadata tags when available
Originally committed as revision 17612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:13:48 +00:00
Aurelien Jacobs
2904fd398f return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:11:18 +00:00
Aurelien Jacobs
b97fb809b8 cosmetics: indentation
Originally committed as revision 17610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:08:22 +00:00
Aurelien Jacobs
1ee2d44805 use new metadata API in mov muxer
Originally committed as revision 17609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:06:49 +00:00
Aurelien Jacobs
ed118841ea don't trigger metadata compatibility code when user app already set metadata
using new API

Originally committed as revision 17608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:00:13 +00:00
Baptiste Coudurier
e34a5996b9 dv probe
Originally committed as revision 17607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 08:45:59 +00:00
Justin Ruggles
2578326f13 Share the function to write a raw FLAC header and use it in the Matroska
muxer.

Originally committed as revision 17606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:41:53 +00:00
Justin Ruggles
faec0eba8b cosmetics: add a comment in flac_write_header().
Originally committed as revision 17605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:33:19 +00:00
Justin Ruggles
25582b8929 Add support for full header extradata to raw FLAC muxer.
Originally committed as revision 17604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:32:18 +00:00
Justin Ruggles
59c6178a54 Use a shared function to validate FLAC extradata.
Originally committed as revision 17602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:29:24 +00:00
Justin Ruggles
caee91f7d0 Separate the raw FLAC muxer from raw.c to its own file, flacenc.c.
Originally committed as revision 17601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:21:43 +00:00
Diego Biurrun
22e77e44dd spelling/wording/grammar cosmetics
Originally committed as revision 17589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 19:10:39 +00:00
Michael Niedermayer
882fb0a3ad untypo
Originally committed as revision 17586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 10:45:08 +00:00
Baptiste Coudurier
28c1720023 fix index edit rate, inverse num and den
Originally committed as revision 17583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 08:09:13 +00:00
Baptiste Coudurier
e38badbc21 simplify, use codec->block_align
Originally committed as revision 17582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 08:08:10 +00:00
Baptiste Coudurier
37653f0b93 set channel number even for inactive channels
Originally committed as revision 17581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 08:06:15 +00:00
Baptiste Coudurier
6df1deda30 do not set frame start bit since marked as not used and factorize
Originally committed as revision 17580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 08:05:43 +00:00
Michael Niedermayer
1de2db8fab AVInputFormat.reed_seek2()
Originally committed as revision 17579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-25 03:18:11 +00:00
Ivan Schreter
27ca0a79c9 Add timestamp computation if values are exported by decoder.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 22:19:09 +00:00
Ivan Schreter
810c451b02 Change duration computation to use time_base instead of TB/2.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 20:17:02 +00:00
Michael Niedermayer
2591821213 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 15:04:18 +00:00
Michael Niedermayer
7f123e7f8a Add CODEC_ID_H264 to tb_unreliable(), it belongs there for the same
reason as mpeg2. (telecine amongth others)

Originally committed as revision 17551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 13:35:54 +00:00
Baptiste Coudurier
40284e9c8b start track id at 2, track id 1 for timecode
Originally committed as revision 17545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-23 19:51:16 +00:00