Commit Graph

3766 Commits

Author SHA1 Message Date
Baptiste Coudurier
5ef3ad59f2 move version specific parsing code before codec specific code, will be needed
Originally committed as revision 14504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:35:43 +00:00
Michael Niedermayer
758af9868e Recommit r14497
Log:
	Add missing header #includes.
Limited to ffm.h & swf.h which are maintained by baptiste who requested that
version to be kept.

Originally committed as revision 14501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 23:12:10 +00:00
Michael Niedermayer
c5e56a813b Revert r14497
Log:
	Add missing header #includes.
Policy violation (change not approved by maintainer)
and while discussions where ongoing and no consensus has been reached.

Originally committed as revision 14500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 22:29:29 +00:00
Diego Biurrun
2e11268ea9 Add missing header #includes.
Originally committed as revision 14497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 16:29:26 +00:00
Art Clarke
138568e9da downgrade mov negative ctts log message to warning, patch by Art Clarke, aclarke at vlideshow dot com
Originally committed as revision 14492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 19:44:42 +00:00
Baptiste Coudurier
39a127bfbc Only reset buffer state if seeking is successful; update seek reg ref.
Originally committed as revision 14491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 19:40:06 +00:00
Baptiste Coudurier
d701934bef check url_fseek return value
Originally committed as revision 14490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 18:12:37 +00:00
Baptiste Coudurier
aaec4e03e9 check url_fseek return value, update seek reg tests
Originally committed as revision 14489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 18:02:55 +00:00
Baptiste Coudurier
22e7d9cc25 skip flv video info / command frame packets, fix issue #546
Originally committed as revision 14480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 02:26:40 +00:00
Baptiste Coudurier
62f2523062 change assert test due to the new reducing of time_base in av_set_pts_info, fix #561
Originally committed as revision 14477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 21:07:54 +00:00
Peter Ross
af8ed96f45 EA Demuxer: make rev2 flag optional
Originally committed as revision 14474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 07:41:32 +00:00
Baptiste Coudurier
f07fd8c08c add a bunch of new xdcam hd422 fourccs
Originally committed as revision 14473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:55:59 +00:00
Baptiste Coudurier
7fc628cad9 more hdv fourccs
Originally committed as revision 14472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:41:12 +00:00
Baptiste Coudurier
138ef0a9a2 update hdv fourcc descriptions
Originally committed as revision 14471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:39:20 +00:00
Stefano Sabatini
c16184e9ba Fix a typo in sdp_write_header(): change "IPV4", which is not a valid
network address type, to "IP4".

Originally committed as revision 14465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 10:45:53 +00:00
Michael Niedermayer
452a398fd6 Fix misdetection of H.264 in mpegts as mpeg1video in mpegts.
Fixes maybeH264_dumpstream

Originally committed as revision 14445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 23:06:22 +00:00
Stefano Sabatini
af274fd1e1 Improve long names for FFM muxer and demuxer:
change "ffm format" to "FFM (FFserver live feed) format".

Originally committed as revision 14438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 20:59:40 +00:00
Aurelien Jacobs
d3d265b288 matroska: add support for A_QUICKTIME/QDM2 codec
Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 15:12:00 +00:00
Aurelien Jacobs
f009e36f75 matroska: add support for V_QUICKTIME track type
Originally committed as revision 14429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 15:11:04 +00:00
Michael Niedermayer
01037451f9 Detect IDR less H.264 correctly.
Fixes maybeH264_dumpvideo

Originally committed as revision 14424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 18:54:26 +00:00
Peter Ross
249f324364 Support 32-bit floating point audio samples in Sun AU demuxer
Originally committed as revision 14410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 07:09:44 +00:00
Joakim Plate
4c8e5dfcc5 Fix handling of old nuv files where an aspect of 1 actually means 4/3
Patch by elupus (elupus ecce se)

Originally committed as revision 14382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-25 04:10:32 +00:00
Joakim Plate
3a459ebe35 aspect stored in nuv files must be converted from display- to sample-aspect.
Patch by elupus (elupus ecce se)

Originally committed as revision 14375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 18:40:43 +00:00
Diego Biurrun
ca74c0a180 cosmetics: Fix two common typos: wont --> will not, lets --> let us.
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:09:28 +00:00
John Schmiederer
ec072669f7 Use tkhd matrix for proper display in mov.
Patch by John Schmiederer jschmiederer on2 com
Original thread: [PATCH] Use tkhd matrix for proper display in mov
Date: 05/23/2008 09:31 PM

Originally committed as revision 14365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 07:55:11 +00:00
Kostya Shishkov
327ce5e6e6 SMPTE 421M Annex L (aka .rcv) muxer
Originally committed as revision 14352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 17:06:40 +00:00
Baptiste Coudurier
f12c4bba79 add ogv extension
Originally committed as revision 14295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 03:29:16 +00:00
Baptiste Coudurier
0fb6c620c0 cosmetics, remove space
Originally committed as revision 14294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 03:27:24 +00:00
Baptiste Coudurier
9b92ed7666 update swf video frame number when muxing done, fix #439
Originally committed as revision 14293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 03:25:50 +00:00
Erik Hovland
be390a4e2e Fix a mem leak in av_find_stream_info().
Patch by Erik Hovland erik hovland org

Originally committed as revision 14276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 07:13:56 +00:00
Måns Rullgård
c6002ea14d MPEGTS: Improve probe function
When a sync byte is found, check that transport_error_indicator is zero,
and adaptation_field_control is valid (non-zero).

Originally committed as revision 14274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 01:07:17 +00:00
Baptiste Coudurier
5469b788ea cosmetics, remove space
Originally committed as revision 14273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 00:24:31 +00:00
Baptiste Coudurier
40e7aaa384 Return max score when ftyp atom is encountered.
Originally committed as revision 14272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 00:23:37 +00:00
Michael Niedermayer
2615800a27 Try to fix FATE after my time_base simplification change.
Originally committed as revision 14262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 14:13:44 +00:00
Diego Biurrun
9e4cd83347 cosmetics: Fix mxf codec long name.
Originally committed as revision 14256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-16 17:20:21 +00:00
Siarhei Siamashka
589790c294 OGG: Add padding at end of Vorbis headers
Patch by Siarhei Siamashka <siarhei.siamashka gmail com>

Originally committed as revision 14249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-15 23:00:29 +00:00
Michael Niedermayer
154dffd04c Make flic probe check a few more things.
fixes issue399

Originally committed as revision 14235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 22:55:07 +00:00
Michael Niedermayer
744b4c02c2 Move the codec_id overriding at a slightly better place.
Originally committed as revision 14234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 20:31:17 +00:00
Michael Niedermayer
283c061936 Remove common factors from timebase in av_set_pts_info().
Should fix issue313

Originally committed as revision 14232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 19:11:09 +00:00
Diego Biurrun
fb72cf46f7 gifdec.c was removed, purge its entry from the Makefile.
Originally committed as revision 14228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 08:55:07 +00:00
Måns Rullgård
e8420626d0 RTP: use dprintf(), allow compilation with -DDEBUG
Originally committed as revision 14211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:41:10 +00:00
Måns Rullgård
f94981ea6a ASF: use dprintf(), allow compilation with -DDEBUG
Originally committed as revision 14210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:41:07 +00:00
Michael Niedermayer
0b54f3c087 Remove gif demuxer, the code contains a gif decoder and lzw decoder neither
belongs in a demuxer, furthermore the code might be exploitable.
Fixes issue530

Originally committed as revision 14209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 18:47:24 +00:00
Michael Niedermayer
c1c9046656 Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
video codec is used.
Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)

Originally committed as revision 14196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 22:17:13 +00:00
Michael Niedermayer
dd57251cb0 Remove old hackish codec probe system.
Originally committed as revision 14193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 20:40:47 +00:00
Michael Niedermayer
2a72e494c3 Use strcmp() instead of strncmp() in set_codec_from_probe_data().
Originally committed as revision 14190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 20:01:23 +00:00
Michael Niedermayer
25d3fb7374 indent
Originally committed as revision 14189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:57:57 +00:00
Michael Niedermayer
942de2f4fa Only try to probe the codec when the available data has roughly doubled
relative to the last attempt.

Originally committed as revision 14188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:57:30 +00:00
Michael Niedermayer
312d24d5e9 Add mpegvideo and H.264 to the codec probe.
Originally committed as revision 14187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:56:25 +00:00
Michael Niedermayer
010acd8ea1 h264_probe()
Originally committed as revision 14186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:50:48 +00:00
Michael Niedermayer
55823964dc indent
Originally committed as revision 14185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 18:43:02 +00:00
Michael Niedermayer
0bef08e516 New codec probing system try #1.
Originally committed as revision 14184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 18:42:00 +00:00
Michael Niedermayer
3e86dba24b command_streams are type data not unknown.
Originally committed as revision 14183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 16:43:46 +00:00
Michael Niedermayer
9d3b9f2cce Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
cleanup will need this.

Originally committed as revision 14181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 14:28:27 +00:00
Michael Niedermayer
64cd3108df Move set_codec_from_probe_data() up to where the other probe functions are.
Originally committed as revision 14180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 13:25:26 +00:00
Michael Niedermayer
3179da621a Pass AVPacketList instead of the whole context to add_to_pktbuf as that is
all that is needed.

Originally committed as revision 14179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 13:15:00 +00:00
Michael Niedermayer
876ef93d99 simplify
Originally committed as revision 14168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 15:12:44 +00:00
Michael Niedermayer
6e264d45bc Fix misdetection of MPEG-PS (AVSEQ03.DAT and AVSEQ06.DAT) as psxstr.
Originally committed as revision 14167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 15:10:58 +00:00
Diego Biurrun
58607ca7d2 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
Originally committed as revision 14164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:41:11 +00:00
Diego Biurrun
37673b1bdd Move a function and an #ifdef CONFIG_MUXERS so that functions used only for
muxing get disabled when compiling with --disable-muxers.

Originally committed as revision 14163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:39:33 +00:00
Diego Biurrun
66b32ce8d0 Move functions only used for muxing below #ifdef CONFIG_YUV4MPEGPIPE_MUXER,
fixes some warnings when compiling with muxers disabled.

Originally committed as revision 14162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:37:22 +00:00
Anuradha Suraparaju
eb64714c3a Add entry for Dirac codec.
Patch by Anuradha Suraparaju anuradha rd bbc co uk

Originally committed as revision 14151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 11:41:06 +00:00
Luca Abeni
80150f7ee8 Fix MPEG video packetization for RTP
Originally committed as revision 14149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 07:40:54 +00:00
Gregory Montoir
5b8cc860a1 Motion Pixels MVI Demuxer.
Patch by Gregory Montoir <cyx <at> users <dot> sourceforge <dot> net>

Originally committed as revision 14147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 03:02:19 +00:00
Michael Niedermayer
cdb5af79e3 indent
Originally committed as revision 14133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:26:26 +00:00
Michael Niedermayer
7efeb73a5a 10000l for myself, my last change was incomplete.
This one also reverts the libav mpeg ts regression test score change.

Originally committed as revision 14132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:25:01 +00:00
Erik Hovland
72e043dd0f One-bit bitfields should probably be unsigned. Unfortunately, it is left
up to the compiler on how one bit fields are treated. gcc treats one-bit
bitfields as signed and allows for the -funsigned-field parameter. Other
compilers (like Sun C) treat one-bit bitfields as unsigned no matter what.
Patch by Erik Hovland erik hovland org

Originally committed as revision 14131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:20:22 +00:00
Michael Niedermayer
6d77d9acf7 Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
to be AV_NOPTS_VALUE.

Originally committed as revision 14118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 14:07:37 +00:00
Peter Ross
b2f181c270 Electronic Arts CMV demuxer
Originally committed as revision 14111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 13:24:13 +00:00
Peter Ross
60f451b6fe Remove AVPaletteControl from ALG MM demuxer/decoder
Originally committed as revision 14109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 12:44:08 +00:00
Luca Abeni
f6f848397a Remove outdated comment
Originally committed as revision 14107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 08:22:16 +00:00
Stefano Sabatini
265fccccde Print libavformat version in outgoing SDPs.
Originally committed as revision 14106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 07:05:57 +00:00
Reimar Döffinger
00496302d6 10l, fix nuv_header for the case when there is no video stream.
Originally committed as revision 14101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 16:30:39 +00:00
Diego Biurrun
76d3242835 Alphabetically order AVInputFormat/AVOutputFormat declarations.
Originally committed as revision 14100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 11:11:08 +00:00
Diego Biurrun
900eb63dd3 Add a note to remind people to add new raw formats to the Makefile.
Originally committed as revision 14099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 10:45:36 +00:00
Diego Biurrun
0c7b4823b3 Add missing dependency declaration for raw Dirac demuxer.
Originally committed as revision 14098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 10:44:34 +00:00
Diego Biurrun
ac1ea66e17 spelling cosmetics in PCM codec long names
Originally committed as revision 14097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 10:37:18 +00:00
Aurelien Jacobs
92b2bc59c9 add some missing dependencies
Originally committed as revision 14095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 20:48:47 +00:00
Gregory Montoir
ca3ed63e15 Remove inaccurate computation of pts for audio packets and rely on
libavformat to generate them.
patch by Gregory Montoir, cyx users sourceforge net

Originally committed as revision 14085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 10:00:12 +00:00
Michael Niedermayer
0328995893 All mp3 parsers are buggy fix 2 of n (out of array write, i suspect not exploitable)
Originally committed as revision 14070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:04:41 +00:00
Michael Niedermayer
d5ae45841f All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas
and found by reimar) fix is from reimar + cosmetics by me.

Originally committed as revision 14069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:00:35 +00:00
Diego Biurrun
15d6e3612f spelling cosmetics
Originally committed as revision 14064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 13:05:06 +00:00
Ronald S. Bultje
1e2802c5cf Reindent after r14059, see "[PATCH] allow empty params for
av_open_input_stream()".

Originally committed as revision 14060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-03 12:12:03 +00:00
Ronald S. Bultje
e145ce2027 Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
empty params for av_open_input_stream()".

Originally committed as revision 14059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-03 12:10:54 +00:00
Luca Abeni
fba7815d8d Reindent after last commit
Originally committed as revision 14046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-02 10:26:23 +00:00
Luca Abeni
d6b9e57af2 Fix A/V synch for RTP streams that do not contain MPEG1 or 2
(correctly compute the presentation times based on the RTP timestamps
and the RTCP SR packets)

Originally committed as revision 14045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-02 10:23:27 +00:00
Baptiste Coudurier
90ffc4902e include track id in error message
Originally committed as revision 14025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 20:32:37 +00:00
Reimar Döffinger
ddca6ab678 Change mtv_read_packet so it does not break after seeking (displaying a shifted image).
Originally committed as revision 14020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 09:01:16 +00:00
Reimar Döffinger
34bfe875d5 Fix pkt->pos to really point at start of packet for mtv audio packets.
Originally committed as revision 14019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 08:59:02 +00:00
Baptiste Coudurier
6f557c6a36 cosmetics
Originally committed as revision 14018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 04:54:39 +00:00
Baptiste Coudurier
c7adbedb08 cosmetics, align vertically
Originally committed as revision 14017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 04:53:01 +00:00
Baptiste Coudurier
c187f461f5 unset Track sets, relying in AVStream->priv_data and will be freed in av_close_input_file
Originally committed as revision 14016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:43:15 +00:00
Stefan Gehrer
6d083dd7e9 fix size of header data
Originally committed as revision 14015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:42:08 +00:00
Baptiste Coudurier
bc4c3a55f5 clarify error message about codec tag
Originally committed as revision 14013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:29:11 +00:00
Baptiste Coudurier
150611474e give context to av_log
Originally committed as revision 14012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 19:00:04 +00:00
Luca Abeni
6872368355 Do not free the priv_data field of AVStream on close (it is already
freed by av_close_input_stream())

Originally committed as revision 14006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 11:55:25 +00:00
Michael Niedermayer
44369b45eb indent
Originally committed as revision 14005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:06:10 +00:00
Michael Niedermayer
fd147f23a2 Inform the user about unhandled sectors.
Originally committed as revision 14004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:05:21 +00:00
Michael Niedermayer
66602c67be memleak
Originally committed as revision 14003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:02:42 +00:00
Michael Niedermayer
435a6082f9 Do not completely bail out for invalid params, just skip the current sector.
Originally committed as revision 14002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:00:00 +00:00
Michael Niedermayer
ad9c10556c merge decl & init
Originally committed as revision 14001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:55:39 +00:00
Michael Niedermayer
a4fe6826de Get rid of weird pre reading code.
Originally committed as revision 14000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:53:43 +00:00
Michael Niedermayer
d0b76b98c4 Remove debugging trash.
Originally committed as revision 13999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:45:19 +00:00
Michael Niedermayer
7669935ac4 Another variable that did nothing at all
Originally committed as revision 13998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:43:18 +00:00
Michael Niedermayer
73d3a14d82 remove code that discards streams randomly
Originally committed as revision 13997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:42:13 +00:00
Michael Niedermayer
e100245441 vertical align
Originally committed as revision 13996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:30:14 +00:00
Michael Niedermayer
c1f6eca124 Remove a dozen unused variables.
Originally committed as revision 13995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:28:58 +00:00
Michael Niedermayer
a4d64c1709 unused var
Originally committed as revision 13994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:23:57 +00:00
Michael Niedermayer
fdb5932e35 Fix exploitable code.
Fixes issue311

Originally committed as revision 13993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:22:10 +00:00
Michael Niedermayer
dd7a68b6da Remove start_time guessing code.
Originally committed as revision 13988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 13:42:26 +00:00
Michael Niedermayer
3041a4a13d Also print flags with FF_FDEBUG_TS.
Originally committed as revision 13987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 11:28:24 +00:00
Michael Niedermayer
f53dd4682c Prevent invalid timestamps from being stored.
Originally committed as revision 13983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 22:37:26 +00:00
Benjamin Larsson
75d27450a1 Add support for mp3 contained in oma
Originally committed as revision 13980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:59:52 +00:00
Benjamin Larsson
de8c8181a9 Rearrange parameter logic
Originally committed as revision 13979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:57:57 +00:00
Benjamin Larsson
f035fe9755 Add more codec IDs and tags.
Originally committed as revision 13977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:39:38 +00:00
Baptiste Coudurier
f3b5a1a260 make av_find_stream_info find frame_size for aac too
Originally committed as revision 13976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:30:48 +00:00
Michael Niedermayer
4d35bf74f9 Make av_find_stream_info() find the frame_size for vorbis.
Originally committed as revision 13972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:36:41 +00:00
Michael Niedermayer
6e1aa0f383 Fill missing pts in during muxing when we know that they are equal to dts.
Originally committed as revision 13970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:31:48 +00:00
Michael Niedermayer
c924ca78b6 We cannot calculate the duration of vorbis packets even if we do know the
"minimal" frame_size.

Originally committed as revision 13969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:15:04 +00:00
Luca Abeni
a4696aa2fe Remove improper usage of AV_TIME_BASE_Q
Originally committed as revision 13960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 11:55:57 +00:00
Michael Niedermayer
796d200a77 Prevent duration calculation code from generating random durations for
vorbis in ogg.

Originally committed as revision 13958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 23:56:16 +00:00
Luca Abeni
309d32b0db Do not set sample_rate = 90000 for mp2 and mp3 audio over RTP
Originally committed as revision 13943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 11:07:04 +00:00
Diego Biurrun
07cb073bf9 Remove unused variable, fixes the warning:
libavformat/rmdec.c:280: warning: unused variable 'i'

Originally committed as revision 13909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 08:52:44 +00:00
Baptiste Coudurier
d4fdba0df7 chinese avs demuxing support, demux AVSFileFormat.mp4
Originally committed as revision 13899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 23:52:57 +00:00
Evgeniy Stepanov
5e8477b011 matroskadec: decode track private data if needed
original patch by Evgeniy Stepanov  eugeni.stepanov _at_ gmail _dot_ com

Originally committed as revision 13892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:52:28 +00:00
Evgeniy Stepanov
935ec5a1d5 matroskadec: move buffer decoding code to a separate function
original patch by Evgeniy Stepanov  eugeni.stepanov _at_ gmail.com

Originally committed as revision 13891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:49:44 +00:00
Aurelien Jacobs
51e1cc16d3 matroskadec: fix a memory leak
Originally committed as revision 13890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:46:36 +00:00
Baptiste Coudurier
fabb990ec2 cosmetics, pts->dts
Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:53:44 +00:00
Baptiste Coudurier
148c8d8018 store dts in ffm headers
Originally committed as revision 13880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:50:57 +00:00
Baptiste Coudurier
5e5f75cf8a remove pts set hack, this is no more correct
Originally committed as revision 13879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:44:58 +00:00
Baptiste Coudurier
dbedf2aae2 enable feeder threads
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:35:43 +00:00
Baptiste Coudurier
54e5cf132d do not reset ffm pts, this avoids setting last pts to 0 and screwing up seeking
Originally committed as revision 13856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:26:25 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:22:56 +00:00
Baptiste Coudurier
ccafd47251 factorize read_header failure freeing code
Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:16:56 +00:00
Art Clarke
6919e54c00 Check if there is at least a stream before writing trailer.
Patch by Art Clarke: aclarke vlideshow com

Originally committed as revision 13836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 07:27:44 +00:00
Baptiste Coudurier
9b64a036c0 remove useless close funcs
Originally committed as revision 13835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 23:25:04 +00:00
Baptiste Coudurier
2562ccb38d remove useless close func
Originally committed as revision 13834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:58:13 +00:00
Baptiste Coudurier
6a862b4947 remove useless close func
Originally committed as revision 13833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:57:00 +00:00
Baptiste Coudurier
9f5d3b13cf ffm has no per stream priv_data anymore
Originally committed as revision 13832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:50:17 +00:00
Luca Abeni
e917464155 Fix neverending loop which might happen when sending high-bitrate MPEG2
video over RTP

Originally committed as revision 13813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 10:31:45 +00:00
Florian Echtler
25176d6e22 Parse 'dats' as data.
Patch by Florian Echtler: floe butterbrot org

Originally committed as revision 13801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-18 09:03:38 +00:00
Art Clarke
e3ec60d82a free private streamcontext when closing demuxer, fix memory leak, patch by Art Clarke, aclarke at vlideshow dot com
Originally committed as revision 13800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-18 08:30:50 +00:00
Aurelien Jacobs
ded4241bb0 matroskadec: remove some useless code
Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 23:11:02 +00:00
Baptiste Coudurier
40f8675ccf set correct ftyp minor version for 3gp/2
Originally committed as revision 13774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-15 01:38:38 +00:00
Baptiste Coudurier
6ba9ed9557 invert mode_mov condition
Originally committed as revision 13773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:12:51 +00:00
Baptiste Coudurier
d3e4783212 simplify
Originally committed as revision 13772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:11:16 +00:00
Baptiste Coudurier
3473ca9a25 change 3gp/3g2 brands if h264 is present
Originally committed as revision 13771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:10:11 +00:00
Baptiste Coudurier
cd70d17f5f simplify ipod brand selection
Originally committed as revision 13770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:07:59 +00:00
Baptiste Coudurier
7b0fb8b77a fix warning, write_ftyp return int now
Originally committed as revision 13769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:06:10 +00:00
Baptiste Coudurier
835790846c put avc1 brand in compat list when h264 is present
Originally committed as revision 13768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:05:28 +00:00
Michael Niedermayer
65f526835f I think we are also compliant to iso2.
Originally committed as revision 13765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 13:52:53 +00:00
Michael Niedermayer
ed6e47c21d Add isom to the compatible brands.
Originally committed as revision 13764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 12:19:01 +00:00
Michael Niedermayer
1560b66714 Calculate ftyp size instead of hardcoding it.
Originally committed as revision 13763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 11:30:36 +00:00
Michael Niedermayer
a04aec6d1a simplify MODE_3G2
Originally committed as revision 13755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:41 +00:00
Michael Niedermayer
2c77994fc8 Change MODE_* to 1<<c so several can be set at the same time.
Originally committed as revision 13754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:08 +00:00
Baptiste Coudurier
ce072b2d30 cosmetics, reindent
Originally committed as revision 13752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:56:54 +00:00
Baptiste Coudurier
283c9a8ed4 don't write double sets of metadata in mov, only write usual ones
Originally committed as revision 13751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:55:49 +00:00
Joakim Plate
de6a9a2673 matroskadec: set cur_dts after seek
patch by elupus   elupus _at_ ecce _dot_ se

Originally committed as revision 13748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 19:54:17 +00:00
Baptiste Coudurier
927509e10b indent
Originally committed as revision 13747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:40 +00:00
Baptiste Coudurier
c6e2c6c9c6 support for 3gp metadata
Originally committed as revision 13746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:22 +00:00
Baptiste Coudurier
07b7b06d92 move utf8 code before udta func, will be used by 3gp tags
Originally committed as revision 13745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:35:02 +00:00
Baptiste Coudurier
c55cc074cc write usual brand for ipod format
Originally committed as revision 13744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:33:35 +00:00
Baptiste Coudurier
d32d6defee simplify
Originally committed as revision 13743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:06:27 +00:00
Baptiste Coudurier
20e22af85a factorize psp metadata
Originally committed as revision 13742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:02:01 +00:00
Baptiste Coudurier
f7635edb4d cosmetics
Originally committed as revision 13741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:50:41 +00:00
Baptiste Coudurier
c3858df291 cosmetics
Originally committed as revision 13740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:39:35 +00:00
Baptiste Coudurier
709c9f8de3 support alac in ipod m4a format, tested on quicktime
Originally committed as revision 13739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:17:38 +00:00
Baptiste Coudurier
ccec1b69c0 m4v/m4a are usual itunes/ipod/iphone extensions
Originally committed as revision 13737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 22:14:58 +00:00
Baptiste Coudurier
d88812a91f indent
Originally committed as revision 13736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 20:14:09 +00:00
Baptiste Coudurier
d1d87dfba0 rework udta handling, if any track set bitexact, don't write any metadata
Originally committed as revision 13735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 20:13:44 +00:00
Baptiste Coudurier
1dc7ff331a 10l, add parentheses
Originally committed as revision 13734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:58:35 +00:00
Baptiste Coudurier
cabc1a7dce indent
Originally committed as revision 13733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:56:59 +00:00
Baptiste Coudurier
b63ba850c1 remove obsolete requirements, quicktime 6 is from 2002, not sure if muxing scheme still fits
Originally committed as revision 13732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:56:45 +00:00
Baptiste Coudurier
0724373d2c cosmetics
Originally committed as revision 13731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 18:23:06 +00:00
Michael Niedermayer
45b2b05f8e Make timestamp debugging work nicer.
Originally committed as revision 13728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 13:38:56 +00:00
Albert Astals Cid
e785efc49a Fix compilation with -DDEBUG, patch by Albert Astals Cid, aastals tv-wan es.
Originally committed as revision 13727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 08:44:45 +00:00
Baptiste Coudurier
83657f9f1c remove now unneeded vars
Originally committed as revision 13726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 07:43:59 +00:00
Baptiste Coudurier
3c6a9f66b9 pass dts and pts through ffm, should fix streaming b frames
Originally committed as revision 13725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 07:43:14 +00:00
Baptiste Coudurier
7080cbe2c8 pass extradata through ffm
Originally committed as revision 13721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:36:27 +00:00
Baptiste Coudurier
3438d82d4b remove ugly ffm_nopts hack, use AVFormatContext->timestamp
Originally committed as revision 13718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:24:29 +00:00
Benjamin Larsson
b339f0c6be Oma demuxer
Originally committed as revision 13712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 17:12:25 +00:00
Baptiste Coudurier
2940b38ef2 fix pts handling in ffm
Originally committed as revision 13683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 00:49:03 +00:00
Baptiste Coudurier
c07d64c890 Reset reading state after successful seek.
Originally committed as revision 13682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 00:35:37 +00:00
Ramiro Polla
15d856e8d2 Remove wrappers of pcm_read_seek().
Last commit missed one file.

Originally committed as revision 13681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 21:54:07 +00:00
Ramiro Polla
5256e42c0b Remove wrappers of pcm_read_seek().
Originally committed as revision 13680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 21:53:03 +00:00
Baptiste Coudurier
b30bb5357d cosmetics, rename first to header, more explicit name
Originally committed as revision 13677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 20:36:16 +00:00
Baptiste Coudurier
a1011180d5 cosmetics, rename first to header, more explicit name
Originally committed as revision 13676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 20:14:47 +00:00
Diego Biurrun
969f949300 Remove Fabrice's copyright from the Makefiles. They have been entirely
rewritten since they were originally created.

Originally committed as revision 13675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:50:32 +00:00
Ramiro Polla
bea91b8c29 Remove useless img_read_close().
Originally committed as revision 13674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:02:06 +00:00
Ramiro Polla
2377922192 Remove unneeded NULL at end of struct.
Originally committed as revision 13673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:00:28 +00:00
Ramiro Polla
fc9c2d53c3 Merge declaration and initialization.
Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 16:53:01 +00:00
Stefano Sabatini
ffa5ed2464 cosmetics: s/Id/id/ in libavformat where Id refers to id Software.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-05 15:03:55 +00:00
Aurelien Jacobs
03b9d94e86 matroskadec: remove some useless code
Originally committed as revision 13659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:24:55 +00:00
Aurelien Jacobs
e9b56825be cosmetics: indentation
Originally committed as revision 13658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:15:08 +00:00
Aurelien Jacobs
fc4738ae96 matroskadec: don't remove dummy level when none was added
Originally committed as revision 13657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:11:47 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Aurelien Jacobs
ca162a5004 Ensure the first audio stream is selected as the default stream
when no video stream is present.

Originally committed as revision 13648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:19:43 +00:00
Aurelien Jacobs
401cdd519c adjust comment to reality
Originally committed as revision 13647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:14:21 +00:00
Aurelien Jacobs
94f6c011d6 matroskadec: sane default value for track->time_scale
Originally committed as revision 13646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:09:30 +00:00
Baptiste Coudurier
d3ad044ad5 add pretty common .m2t as ts extension
Originally committed as revision 13642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 00:55:05 +00:00