1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

4383 Commits

Author SHA1 Message Date
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
Baptiste Coudurier
8dc81a4524 seek at 0 when timestamp requested is negative
Originally committed as revision 16815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 04:29:33 +00:00
Aurelien Jacobs
7a42067176 make it clear that the new metadata API is a work in progress
Originally committed as revision 16812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 23:39:22 +00:00
Diego Biurrun
c60208e7a1 Directly #include some required headers.
Originally committed as revision 16780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 19:11:10 +00:00
Stefano Sabatini
4815e24623 Move documentation of av_register_all() from allformats.c to
avformat.h, and extend it.

Originally committed as revision 16774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 16:44:45 +00:00
Justin Ruggles
7fa9a0a256 use function and definitions from libavcodec/flac.h in oggparseflac.c
Originally committed as revision 16767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 01:21:10 +00:00
David DeHaven
6cde949a20 Handle ID3v2 tags in raw FLAC streams by skipping them.
Patch by David DeHaven (dave sagetv com)

Originally committed as revision 16764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 00:16:27 +00:00
Diego Biurrun
da837937c6 Fix undefined preprocessor directives warnings during 'make checkheaders'.
Originally committed as revision 16747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24 14:52:46 +00:00
Stefan Gehrer
1ac63c2a9b return an error if we can not get a full packet,
fixes hang on EOF

Originally committed as revision 16740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24 08:20:42 +00:00
Stefan Gehrer
c6f79c3e0b fix header parsing, the NULL terminated File ID is followed by a space
Originally committed as revision 16738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24 08:06:43 +00:00
Ronald S. Bultje
cb760a4790 Skip m= blocks in the SDP if the media type is unknown. This prevents
subsequent a= lines from the m= block to be applied to the previous
m= line, thus breaking otherwise functional RTP streams. See discussion in
[PATCH] RTSP-MS 7/15: parse and allow unknown m= line codes" thread on
mailinglist.

Originally committed as revision 16737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24 04:56:18 +00:00
Baptiste Coudurier
14120c95f0 set pts and dts when only pts is present, according to specs
Originally committed as revision 16734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 22:16:31 +00:00
Baptiste Coudurier
6e4668b8a9 write essence container data
Originally committed as revision 16733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:57:12 +00:00
Baptiste Coudurier
5e4aa542de reduce display aspect ratio
Originally committed as revision 16732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:20:36 +00:00
Baptiste Coudurier
24d6a613e0 stored height is a multiple of 16 for mpeg2
Originally committed as revision 16731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:15:46 +00:00
Baptiste Coudurier
e9338da87d fix endianness of time code, and calculate it in fields, according to specs
Originally committed as revision 16730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 20:03:57 +00:00
Ben Littler
76af2edc44 add EM4A fourcc , works for:
http://av.watch.impress.co.jp/docs/20040929/xf.asf

Originally committed as revision 16729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 12:17:40 +00:00
Andreas Öman
cf92cec7d8 Avoid allocating MPADecodeContext on stack.
Instead move relevant fields into MPADecodeHeader and use it
where appropriate.

Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 12:09:32 +00:00
Michael Niedermayer
3a41c2f769 Move av_read_frame/parser related buffer variables from AVFormatContext
to AVStream, this is required if we want to allow the user to pull frames
from specific streams at some point in the future.

Originally committed as revision 16724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-22 23:35:31 +00:00
Baptiste Coudurier
082491c473 print stream sar if present and different than codec sar
Originally committed as revision 16720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-22 19:45:53 +00:00
Michael Niedermayer
a308737bd6 Use EAGAIN return, primarely intended as example of EAGAIN useage.
Originally committed as revision 16719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-22 12:08:06 +00:00
Michael Niedermayer
cda6902d36 Handle av_read_frame() EAGAIN return.
Originally committed as revision 16718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-22 12:06:02 +00:00
Aurelien Jacobs
dce25564cc 'code' is used to index a table so make it unsigned
this prevents using negative index and possibly crashing with broken files

Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 22:32:17 +00:00
Kostya Shishkov
d6da3df729 yet another attempt on fixing synchronization in VMD
Originally committed as revision 16711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 13:27:39 +00:00
Kostya Shishkov
8d6fc274fa Empty audio chunks in VMD are silent, not skipped
Originally committed as revision 16710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 13:26:01 +00:00
Kostya Shishkov
7d2b199b8d cosmetics: reindent after last commit
Originally committed as revision 16709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 13:25:14 +00:00
Kostya Shishkov
716ba2d01c VMD first chunk of audio is not coded as many separate chunks of block_align
size. Thus, make demuxer and decoder handle it as a whole.

Originally committed as revision 16708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 13:24:35 +00:00
Baptiste Coudurier
f53ee31275 change sample aspect ratio test to be more clear, print old one
Originally committed as revision 16703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 21:06:57 +00:00
Ben Littler
5823e4b8f6 another mpeg4 fourcc
Originally committed as revision 16702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 16:19:13 +00:00
Baptiste Coudurier
507ff760af Do not use avctx->frame_number which might not be set,
this also fixes a side effect where its value was one too much.

Originally committed as revision 16701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:43:58 +00:00
Baptiste Coudurier
15a4e8b85a set correct value for starting line
Originally committed as revision 16698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:25:50 +00:00
Baptiste Coudurier
fc94187857 fix gxf time code mark out value
Originally committed as revision 16697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 09:14:46 +00:00
Benoit Fouet
27cb512219 Enable building r3d demuxer when its config is set.
Originally committed as revision 16696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 08:08:32 +00:00
Alex Converse
38cef58404 Fix a read past end of buffer crash in the mp3 probe
Originally committed as revision 16693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 08:00:39 +00:00
Baptiste Coudurier
7eb68edba7 R3D REDCODE demuxer
Originally committed as revision 16692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 07:42:14 +00:00
Aurelien Jacobs
5f8bae8d5c matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
This implies using ff_avc_parse_nal_units_buf instead of ff_avc_parse_nal_units
because with 3 bytes startcodes the parsed packet size will change, and the
size must be written before the packet content.

Originally committed as revision 16690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 00:52:12 +00:00
Diego Biurrun
c2fef0c163 Use "" instead of <> when #including non-system headers.
Originally committed as revision 16689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 23:41:46 +00:00
Alex Converse
ac3ef4a41b Fix probing of files with ID3v2 tags. Discussed at
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-January/059302.html

Originally committed as revision 16688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 21:54:06 +00:00
Diego Biurrun
6f2009bf45 Restore mistakenly removed period after "DivX, Inc".
Originally committed as revision 16686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 17:01:22 +00:00
Ben Littler
d7c6552c7c add T263. works on samples/V-codecs/T263/
Originally committed as revision 16685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 16:11:46 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Aurelien Jacobs
48a81c0ff5 replace AV_METADATA_IGNORE_CASE flag by a new AV_METADATA_MATCH_CASE flag
with the opposed meaning

Originally committed as revision 16680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 22:53:28 +00:00
Aurelien Jacobs
0e169d16f1 matroskadec: merge ByteIOContext declarations at upper level
Originally committed as revision 16673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 17:26:24 +00:00
Aurelien Jacobs
68a71451f6 matroskadec: parse the WAVEFORMATEX header and discard it from extradata
Originally committed as revision 16672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 17:13:12 +00:00
Baptiste Coudurier
b4097b13d4 add jp2 formater in image2 muxer
Originally committed as revision 16664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 01:48:14 +00:00
Baptiste Coudurier
aa91562501 jpeg2k is intra only codec
Originally committed as revision 16663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 00:47:46 +00:00
Baptiste Coudurier
2323ac0154 match format in names list separated by commas
Originally committed as revision 16659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 21:40:27 +00:00
Stefan Gehrer
055dc116fc added demuxer for FunCom ISS audio files,
extended ADPCM decoder by ISS specific IMA variant

Originally committed as revision 16658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 20:08:43 +00:00
Aurelien Jacobs
2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 12:21:01 +00:00
Aurelien Jacobs
9ce6c13879 export gcd function as av_gcd()
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 11:13:33 +00:00
David Conrad
3194b00479 Cosmetics: indent
Originally committed as revision 16652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 04:31:42 +00:00
David Conrad
1c3db2aa50 Treat disposition==0 as undefined and don't write the default flag
Originally committed as revision 16651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 04:31:14 +00:00
David Conrad
8a86aaa3b2 Flush the buffer after writing the header and when done with writing the files
Fixes writing small (~4kb) files.

Originally committed as revision 16650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 04:30:36 +00:00
Ben Littler
e2260faa42 add LM20 mimic in avi fourcc
Originally committed as revision 16645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 19:05:09 +00:00
Kostya Shishkov
2c96535af7 WavPack hybrid mode support
Originally committed as revision 16643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 17:46:19 +00:00