Commit Graph

4437 Commits

Author SHA1 Message Date
Jindřich Makovička dcd913d9ed Fix minor memory leak.
Patch by Jindrich Makovicka, approved by mans.

Originally committed as revision 17021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 20:30:18 +00:00
Luca Abeni 17a5894a23 Merge rtp_aac.h and rtp_mpv.h in rtpenc.h
Originally committed as revision 17020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 15:30:41 +00:00
Luca Abeni 302879cb36 Split rtp.h in rtp.h, rtpdec.h, and rtpenc.h
Originally committed as revision 17016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 10:35:52 +00:00
Ronald S. Bultje 1a45a9f4c0 Add "AVFormatContext *ctx" (that being the RTSP demuxer's) as first argument
to the parse_packet() function pointer in RTPDynamicProtocolHandlers. This
allows these functions to peek back and retrieve values from the demuxer's
context (or RTSPState). The ASF/RTP payload parser will use this to be able
to parse SDP values (which occur even before the payload ID is given), store
them in the RTSPState and then retrieve them while parsing payload data. See
"[PATCH] RTSP-MS 13/15: add RTSP demuxer AVFormatContext to parse_packet()
function pointer (was: transport context)" mailinglist thread.

Originally committed as revision 17015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 01:37:19 +00:00
Ronald S. Bultje 0a861b6f8b Rename "tx_ctx" and "cur_tx" variables to "transport_priv" and
"cur_transport_priv", as discussed in the "[PATCH] rtsp.h: rename tx
variables" thread.

Originally committed as revision 17012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 22:34:55 +00:00
Baptiste Coudurier f5b288902e format timestamp correctly according to specs and set it
Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 20:15:18 +00:00
Baptiste Coudurier 5ccad11da0 use timestamp as modification date
Originally committed as revision 17010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 19:30:01 +00:00
Alex Converse d0f89acf60 Make the MP3 probe weakly claim all files with ID3v2 tags to fix regressions on
files with very large tags.

Originally committed as revision 17008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 18:41:06 +00:00
Baptiste Coudurier eacc40e84a use timestamp as creation date
Originally committed as revision 17007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 18:32:42 +00:00
Ronald S. Bultje b516ecdd12 Delete an enum and a function typedef that aren't used anywhere, and
move move a struct/typedef in rtsp.h that is only used in ffserver.c into
ffserver.c. See "[PATCH] rtsp.h: move/remove unused thingies" thread on ML.

Originally committed as revision 17005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 17:00:10 +00:00
Luca Abeni 21da81d784 Introduce a new num_frames field in RTPDemuxContext so that rtp_aac.c
does not need to abuse read_buf_index

Originally committed as revision 17004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 14:53:25 +00:00
Peter Ross 468d298d0c Electronic Arts demuxer: support TQI video tag
Originally committed as revision 17003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 08:59:38 +00:00
Baptiste Coudurier 1c7c6669f6 fix key frame offset with open gop
Originally committed as revision 16999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 07:47:39 +00:00
Ronald S. Bultje 1262d638da Move enum RTSPTransport up a bit, so that all fields that are assigned a value
of this type can be properly attributed as such (in this case, transport in
the RTSPTransportField struct). See "[PATCH] RTSP-MS 10/15: ASF header parsing"
thread on mailinglist.

Originally committed as revision 16989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 17:17:20 +00:00
Baptiste Coudurier 034fcddf3c always write mxf time base in descriptors
Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 09:35:59 +00:00
Ramiro Polla 2db5da97e2 Do not misuse unsigned long to store pointers.
Originally committed as revision 16986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 05:56:39 +00:00
Baptiste Coudurier 5a897cfa3c use sample rate as audio input time base
Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 04:50:47 +00:00
Aurelien Jacobs 488227c5d7 write all available metadata tags into extended_content_header
Originally committed as revision 16984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 01:40:52 +00:00
Aurelien Jacobs 300f24f317 use new metadata API in asf muxer
Originally committed as revision 16983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-04 01:37:16 +00:00
Baptiste Coudurier 4f0f9bddac let packet pass through when no timestamps
Originally committed as revision 16982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 23:18:12 +00:00
Baptiste Coudurier 832404cea7 exactly compute index byte count
Originally committed as revision 16981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 23:11:13 +00:00
Baptiste Coudurier bf252f7f6f prevent reading more than container atom size, fix broken file broken_by_rev15830.MOV, fix #818
Originally committed as revision 16979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 23:03:41 +00:00
Aurelien Jacobs 20e2a7aed2 use new metadata API in asf demuxer
Originally committed as revision 16977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 22:12:06 +00:00
Reimar Döffinger 1a534c7f1e Add and use a public API for RC4 and DES, analogous to the AES API.
Originally committed as revision 16970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 14:20:55 +00:00
Michael Niedermayer 88297e80aa Reformat rdt_demuxer AVCodec struct sanely.
Originally committed as revision 16969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 13:12:20 +00:00
Michael Niedermayer 1558d0b910 Fix probe & demuxing of Topfield 58XXPVR and 68XXPVR (topfield.rec)
Originally committed as revision 16968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 11:01:57 +00:00
Aurelien Jacobs c0f1445864 use new metadata API in aiff demuxer
Originally committed as revision 16966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:43:12 +00:00
Baptiste Coudurier 33abc1a73a be more flexible with frame rate check
Originally committed as revision 16965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:37:03 +00:00
Aurelien Jacobs be62f5569e simplify
Originally committed as revision 16964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:25:02 +00:00
Aurelien Jacobs da61e4136a use new metadata API in rtsp demuxer
Originally committed as revision 16961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:09:39 +00:00
Aurelien Jacobs f3650b239e use new metadata API in rtp muxer
Originally committed as revision 16960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:08:25 +00:00
Eli Friedman e80c73b3c1 Add support for fourcc "SP54".
Patch by Eli Friedman eli D friedman A gmail

Originally committed as revision 16958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:43:51 +00:00
Aurelien Jacobs b3a9e50c10 cosmetics: indentation
Originally committed as revision 16957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:17:26 +00:00
Aurelien Jacobs 3b1c4a06f6 simplify usage of dstlen as it is not a parameter anymore
Originally committed as revision 16956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:17:14 +00:00
Aurelien Jacobs ee56cab3f3 cosmetics: indentation
Originally committed as revision 16955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:14:28 +00:00
Aurelien Jacobs b182eeb08b use new metadata API in the mp3 muxer
Originally committed as revision 16954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:13:03 +00:00
Aurelien Jacobs 9d98535ceb use new metadata API in the mp3 demuxer
Originally committed as revision 16953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:11:56 +00:00
Aurelien Jacobs 5ea7ce8843 modify the way to pass parameters to av_metadata_set()
This improves code readability and this avoid warnings about discarding
qualifiers from pointer target type.

Originally committed as revision 16952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 21:45:55 +00:00
Aurelien Jacobs 69b6d53beb cosmetics: whitespace
Originally committed as revision 16951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 21:32:11 +00:00
Baptiste Coudurier 6fb625c455 cosmetics: whitespaces, empty lines
Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 20:29:31 +00:00
Baptiste Coudurier f35254d1aa mxf does not have timestamps
Originally committed as revision 16947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 20:26:49 +00:00
Reimar Döffinger 0b178e5629 Add av_ prefix to LZO stuff and thus make it officially part of the public API.
Keep lzo1x_decode until the next major version bump for binary compatibility.

Originally committed as revision 16946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 20:16:00 +00:00
Stefan de Konink 426a6f34a0 Splits the totalbitrate in a videodatarate and audiodatarate part.
Patch by Stefan de Konink stefan konink de

Originally committed as revision 16944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 16:10:46 +00:00
Stefan de Konink 9a354fe3f9 Implement the reading of the video bitrate of flv movies out of the meta data,
to have the total bitrate available in the avformat structures.
Patch by Stefan de Konink  stefan konink de

Originally committed as revision 16943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 16:05:50 +00:00
Baptiste Coudurier 822617cd50 24bit pcm support
Originally committed as revision 16942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:58:33 +00:00
Baptiste Coudurier 2253d6d773 more flexible mapping selection
Originally committed as revision 16941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:54:10 +00:00
Baptiste Coudurier a4397fa911 fix temporal offet of ipbb sequences, simplification welcome
Originally committed as revision 16940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:41:43 +00:00
Baptiste Coudurier ed00d0c1b0 fix video line map tag size
Originally committed as revision 16938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:10:41 +00:00
Baptiste Coudurier bc185fc161 fix flush and interleaving by edit units
Originally committed as revision 16937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:04:36 +00:00
Baptiste Coudurier 0e9dbd9685 write index table and rip, muxer works pretty well now
Originally committed as revision 16936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 10:03:38 +00:00
Baptiste Coudurier 0290074c31 factorize common wav local tags
Originally committed as revision 16932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:40:57 +00:00
Baptiste Coudurier f9303ffd62 write req local tags for wav
Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:36:54 +00:00
Baptiste Coudurier 4966b98a57 adjust size when not writing f2
Originally committed as revision 16930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 04:00:27 +00:00
Baptiste Coudurier 8ed82d8174 do not write f2 if not interlaced
Originally committed as revision 16929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 03:49:23 +00:00
Baptiste Coudurier cbd70c4100 write bitrate tag
Originally committed as revision 16928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 03:45:03 +00:00
Baptiste Coudurier 724e7d8d8b write display height/width tags
Originally committed as revision 16927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 03:35:09 +00:00
Baptiste Coudurier eee99eb3e8 return eof/error if only ffm header has been written, should fix #815
Originally committed as revision 16924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 22:02:57 +00:00
Aurelien Jacobs 9f5aca8fec don't support the mp3 extension in the mp2 muxer
especially not under any conditionnal

Originally committed as revision 16922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 21:22:12 +00:00
Ronald S. Bultje d1c6e47c16 Fix the Transport: line in the SETUP request so that it works with WMS
servers when trying to set up a session over TCP:
- add the interleave property
- add unicast, only for WMS (since it is normally only UDP, but WMS expects it
   for UDP and TCP)
- add mode=play
See discussion in "[PATCH] RTSP-MS 9/15: add interleave property to the TCP
transport line of the SETUP request" thread on mailinglist.

Originally committed as revision 16913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 13:37:45 +00:00
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Baptiste Coudurier 0646663882 free audio fifo
Originally committed as revision 16905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:17:04 +00:00
Baptiste Coudurier 5efa932d2c use st->priv_data to store per stream context
Originally committed as revision 16904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 11:06:20 +00:00
Baptiste Coudurier 8f819636b7 change prototype of mxf_interleave_get_packet to make it compatible
with av_interleave_packet_per_dts

Originally committed as revision 16903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:51:35 +00:00
Baptiste Coudurier 59bcc93bb1 do not use PAL_samples_per_frame in init, to make init independant
Originally committed as revision 16902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:49:26 +00:00
Baptiste Coudurier a9025f2ae4 cosmetics, remove empty lines
Originally committed as revision 16901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 10:47:55 +00:00
Baptiste Coudurier a1a37f136d add my copyright as well
Originally committed as revision 16900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:54:59 +00:00
Baptiste Coudurier aecee3b214 fix doxygen tag
Originally committed as revision 16899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:53:59 +00:00
Baptiste Coudurier 8090b222ac cosmetics, align vertically
Originally committed as revision 16898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:53:23 +00:00
Baptiste Coudurier 74334ae11e write best effort video line map
Originally committed as revision 16897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:23:50 +00:00
Baptiste Coudurier 4118d68f72 add frame layout local tag, best effort
Originally committed as revision 16896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 09:08:01 +00:00
Baptiste Coudurier baed2ec4c2 add aes3 pcm wrapping and use it by default
Originally committed as revision 16895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 07:02:20 +00:00
Baptiste Coudurier c6b579df52 split wav_desc in generic_sound_desc
Originally committed as revision 16894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:59:55 +00:00
Baptiste Coudurier 3f2795ed54 thanks to interleaving, audio is now locked
Originally committed as revision 16893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:54:30 +00:00
Baptiste Coudurier 221ef8ca38 local tag 3201 is picture essence coding, so do not write it for wav
Originally committed as revision 16892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:49:42 +00:00
Baptiste Coudurier 383dde71f7 stored height is stupidly /2 if interlaced
Originally committed as revision 16891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:46:42 +00:00
Baptiste Coudurier 959005883a add size param to write_generic_desc
Originally committed as revision 16890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:44:25 +00:00
Baptiste Coudurier 52e5cd2b10 parse mpeg2 progressive frame flag
Originally committed as revision 16889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:42:47 +00:00
Baptiste Coudurier 7c7c1a76db delay header writing and parse mpeg2 frame
Originally committed as revision 16888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:32:12 +00:00
Baptiste Coudurier cc812c8c7e correctly pack and interleave pcm samples in mxf
Originally committed as revision 16887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:18:25 +00:00
Baptiste Coudurier 34c65ac668 function is static
Originally committed as revision 16886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:09:31 +00:00
Baptiste Coudurier fd5583bc2d use new ff_interleave_add_packet
Originally committed as revision 16885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:08:42 +00:00
Baptiste Coudurier ccf0071dee split av_interleave_per_dts, to avoid code duplication
Originally committed as revision 16884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 06:01:58 +00:00
Stefan Gehrer 4becee2343 ADPCM found in Xbox wav files can be decoded with
existing CODEC_ID_ADPCM_IMA_WAV

Originally committed as revision 16883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 05:53:04 +00:00
Aurelien Jacobs 04e7670906 typo
Originally committed as revision 16854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-30 00:44:54 +00:00
Ben Littler bf23f6dc33 pvez avi fourcc is truemotion1
Originally committed as revision 16850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-29 15:33:19 +00:00
Michael Niedermayer 0838cfdc8a Fix remotely exploitable arbitrary code execution vulnerability.
Found by Tobias Klein / tk // trapkit / de /
See: http://www.trapkit.de/advisories/TKADV2009-004.txt

Originally committed as revision 16846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-28 13:37:26 +00:00
Baptiste Coudurier d972e56cf2 second try fixing time code in gxf
Originally committed as revision 16839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 23:44:11 +00:00
Michael Niedermayer be195ed1d6 Prefer av_freep() over av_free() for variables in the context for safety.
Originally committed as revision 16838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 22:21:28 +00:00
Michael Niedermayer 0d29b7d572 Add {} between if/else
Originally committed as revision 16837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 22:20:05 +00:00
Michael Niedermayer 9913860bfb Export all tracks (each is a different language) instead of just one.
Originally committed as revision 16836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 22:14:48 +00:00
Michael Niedermayer c58d6796a1 remove pointless {}
Originally committed as revision 16835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 22:03:13 +00:00
Michael Niedermayer a10f1cbb93 Move current_track variable closer to where it is used.
Originally committed as revision 16834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 21:58:45 +00:00
Michael Niedermayer 68e1794e3a Fix memleak of fourxm->tracks on error return.
Originally committed as revision 16833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 21:56:28 +00:00
Michael Niedermayer 4f989885b6 vertical align
Originally committed as revision 16832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 21:09:22 +00:00
Michael Niedermayer cc988dd77f Fix memleak of header in error returns.
Originally committed as revision 16831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 21:06:19 +00:00
Michael Niedermayer 59afda9f61 better header_size check
Originally committed as revision 16830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 21:01:47 +00:00
Michael Niedermayer 4698bb2457 size < 4 is invalid
Originally committed as revision 16829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 20:51:10 +00:00
Benoit Fouet bbfb80f363 Whitespace cosmetics to align return statements.
Originally committed as revision 16826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 18:01:26 +00:00
Benoit Fouet 16f753f43f Check buffer is inside what is passed when probing for flac.
Originally committed as revision 16825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 18:00:40 +00:00
Luca Abeni 20631a9c15 Merge rtp_internal.h in rtp.h, and remove rtp_internal.h
Originally committed as revision 16817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 12:23:16 +00:00