generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,931 Commits 24 Branches 241 Tags 173 MiB
8ba311410a
Commit Graph

4481 Commits

Author SHA1 Message Date
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
Reimar Döffinger
0c5a43d648 Merge declaration and initialization of io_buffer_size 
Originally committed as revision 16639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 16:39:17 +00:00
Reimar Döffinger
2bdaf78c52 Make io_buffer_size unsigned to avoid a warning about comparing 
signed and unsigned values.

Originally committed as revision 16638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 16:37:54 +00:00
Reimar Döffinger
0e7ceb2442 Return AVERROR(ENOMEM) instead of -1 when malloc fails in url_open_dyn_buf_internal 
Originally committed as revision 16636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:35:51 +00:00
Reimar Döffinger
aa805f94c5 Use AV_WB32 instead of reimplementing it. 
Originally committed as revision 16635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:34:37 +00:00
Reimar Döffinger
dc2c2eea41 Use av_mallocz instead of explicitly zeroing in url_open_dyn_buf_internal. 
Originally committed as revision 16634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:32:33 +00:00
Reimar Döffinger
7ce820efa0 Replace nonsense -1234 return value in dyn_buf_write by proper AVERROR(ENOMEM) 
Originally committed as revision 16633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:30:52 +00:00
Marc Mason
9d9aac84f6 Make unsigned int a variable that does not need to be explicitely 32 bits. 
Fixes a warning.
Patch by: Marc Mason mpeg (your_ad_here) blue (chez) free fr

Originally committed as revision 16632 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 14:03:46 +00:00
Baptiste Coudurier
3700d80028 support h264 extradata with 0x000001 startcode 
Originally committed as revision 16627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:26:52 +00:00
Baptiste Coudurier
71e685b018 use ff_avc_parse_nal_units_buf because output size might differ from input size 
Originally committed as revision 16626 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:22:30 +00:00
Baptiste Coudurier
c844520e73 10l, fix prototype 
Originally committed as revision 16625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:20:31 +00:00
Baptiste Coudurier
d298412062 export ff_avc_parse_nal_units_buf 
Originally committed as revision 16624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:17:18 +00:00
Baptiste Coudurier
5d2160a0dd move actual writing before so new size can be taken into account 
Originally committed as revision 16623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:12:32 +00:00
Baptiste Coudurier
a97772b166 return size written in ff_avc_parse_nal_units 
Originally committed as revision 16622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:11:34 +00:00
Luca Abeni
ca93bc175a Reindent after last commit 
Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 14:07:59 +00:00
Luca Abeni
0a63a676ec Do not reallocate AVPacket's data when muxing a packet 
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 14:03:07 +00:00
Alex Converse
2ea512a6c2 Factorise id3v2 header parsing from mp3.c to be shared 
Patch by Alex Converse ( alex converse gmail com )

Originally committed as revision 16615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 12:23:03 +00:00
Baptiste Coudurier
f3ba7c5468 use delay for subs and dirac too 
Originally committed as revision 16614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 01:47:24 +00:00
Baptiste Coudurier
a57fb91ce5 add aud nal unit if not present in h264 bitstream 
Originally committed as revision 16613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 01:22:31 +00:00
Aurelien Jacobs
e0e4be590c matroskadec: ensure we only consider chapters which are properly ordered 
Originally committed as revision 16612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 00:42:57 +00:00
Baptiste Coudurier
89ac55ada9 consider other codecs packets contain only one access unit, not just audio 
Originally committed as revision 16611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 23:53:31 +00:00
Baptiste Coudurier
3d0a94f699 calculate pat, pmt and sdt exact size and adjust total bitrate 
Originally committed as revision 16610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 23:49:13 +00:00
Baptiste Coudurier
620b9df7a7 allow user to specify muxrate 
Originally committed as revision 16609 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 23:30:49 +00:00
Baptiste Coudurier
811a0aa785 warn if dts < pcr which means TS is invalid 
Originally committed as revision 16607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 22:40:37 +00:00
Baptiste Coudurier
5541759f6f only write dts if they differ from pts, according to specs 
Originally committed as revision 16605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 22:17:07 +00:00
Baptiste Coudurier
46911c7ab8 use delay to avoid negative dts 
Originally committed as revision 16604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 22:14:35 +00:00
Baptiste Coudurier
de34dc39c0 set pts and dts of pes packets exactly according to specs 
Originally committed as revision 16603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 21:57:10 +00:00
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Baptiste Coudurier
b5931348bc compute pcr more accurately, regression tests need update 
Originally committed as revision 16596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 02:20:26 +00:00
Baptiste Coudurier
c91662ce83 include intreadwrite.h, fix compilation, img2.c use AV_RL32 
Originally committed as revision 16595 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 01:21:24 +00:00
Baptiste Coudurier
6d32ec6ce9 cleanup gif, use BISTREAM_WRITER_LE 
Originally committed as revision 16591 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 00:27:43 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Ben Littler
ed0879eda9 add SLMJ fourcc to mjpeg 
Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 17:10:10 +00:00
Aurelien Jacobs
8eec0fb674 fix version protection 
Originally committed as revision 16572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 00:20:18 +00:00
Måns Rullgård
7b114c0925 AVI: add bswap.h include needed on big endian 
Originally committed as revision 16564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-12 00:07:40 +00:00
David Conrad
6cdbff63cd Use the dimensions in tkhd for timed text tracks 
Originally committed as revision 16561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 23:24:28 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Ramiro Polla
b507ebd179 Use setmode() if it exists in <io.h>, and not based on O_BINARY. 
Originally committed as revision 16553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:05:43 +00:00
Diego Biurrun
470bce2b55 cosmetics: indentation 
Originally committed as revision 16550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:08:52 +00:00
Diego Biurrun
c54286ab08 Fix illegal identifier starting with an underscore. 
Originally committed as revision 16549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:07:12 +00:00
Baptiste Coudurier
64d50fa551 move ffindex set before mov_read_default so it can be used in functions 
Originally committed as revision 16548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:04:25 +00:00
Baptiste Coudurier
87609b51da cosmetics 
Originally committed as revision 16535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:42:24 +00:00
Baptiste Coudurier
985688b8e5 remove warnings about uninitialized vars 
Originally committed as revision 16534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:41:43 +00:00
Baptiste Coudurier
3d1b0fcd59 cosmetics 
Originally committed as revision 16532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:36:19 +00:00
David Conrad
f620488654 Add support for muxing mov/mp4/3gp timed text streams 
Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:26:44 +00:00
David Conrad
58e9f2edb6 Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text 
Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 08:24:44 +00:00
Baptiste Coudurier
fd7f59639c remove comment, this is not relevant anymore 
Originally committed as revision 16528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 05:24:41 +00:00
Baptiste Coudurier
2ba0470e81 reindent 
Originally committed as revision 16527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 05:23:46 +00:00
Baptiste Coudurier
7d637efa80 check for negative dts value even if bitstream is already formated, 
this fixes dts when stream copying.

Originally committed as revision 16526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 05:23:10 +00:00
Stefano Sabatini
708ec8fb31 Move the AVFormatContext options definition to a dedicated file, 
reduce the utils.c clutter.

Originally committed as revision 16516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-10 09:56:07 +00:00
Ronald S. Bultje
9211bcddb4 Reindent to properly fit a 80 chars terminal. 
Originally committed as revision 16511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 23:44:52 +00:00
Ronald S. Bultje
ff16f551cf Reindent after r16509. 
Originally committed as revision 16510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 23:36:39 +00:00
Ronald S. Bultje
83d14c85da Apply rtpmap: SDP lines to the last m= line only, since they generally just 
come directly after each m= line if required. See "[PATCH] RTSP-MS 5-6/15:
parse only the last m= line stream per rtpmap line" thread on ML.

Originally committed as revision 16509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 23:36:17 +00:00
Baptiste Coudurier
fa50a0276f only set le if value is 1, fix boom5.mov, issue #770 
Originally committed as revision 16507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 22:13:37 +00:00
Luca Abeni
65007a4fa0 Do not assume that if pkt->destruct != av_destruct_packet then it is not 
necessary to call the destruct method

Originally committed as revision 16506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 20:10:13 +00:00
Ronald S. Bultje
e49906c321 Increase buffer size for RTP packet data because some ASF streams use a 
manual, non-standard blocksize which is bigger than RTP_MAX_PACKET_LENGTH.
See "[PATCH] RTSP-MS 4/15: blocksize detection" thread on mailinglist.

Originally committed as revision 16502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 01:30:14 +00:00
Aurelien Jacobs
5ce0043367 rename ff_metadata_sync_compat to ff_metadata_mux_compat 
Originally committed as revision 16501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 00:01:42 +00:00
Aurelien Jacobs
97ca83a566 move ff_metadata_sync_compat to metadata_compat.c 
Originally committed as revision 16500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 23:30:02 +00:00
Aurelien Jacobs
e99f76ab79 Add a second metadata compatibility layer, so that metadata that gets 
demuxed with new API is automatically converted to the old API,
allowing old applications to stay functional.

Originally committed as revision 16499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 23:24:51 +00:00
Ben Littler
54f8abde93 cosmetics: CJPG is from Creative Webcam 
Originally committed as revision 16497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 18:00:51 +00:00
Ben Littler
949462b32e fourcc CJPG is sequential jpeg 
Originally committed as revision 16496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 17:51:03 +00:00
Baptiste Coudurier
15cdff8525 100l, add missing enum type, fix compilation 
Originally committed as revision 16495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 07:11:43 +00:00
Baptiste Coudurier
8a47ad5e7c use lower case x and alternate format for hex in printf 
Originally committed as revision 16494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 02:57:21 +00:00
Baptiste Coudurier
861b4f012a print more debug information if enabled, including index 
Originally committed as revision 16493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 02:54:43 +00:00
Dominique Leuenberger
6fde7afa8d Fix a compiler warning: 
libavformat/rmdec.c:550: warning: assignment makes pointer from integer

Patch by Dominique Leuenberger (dominique-ffmpeg-devel A leuenberger D net)

Originally committed as revision 16489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 23:37:03 +00:00
Michael Niedermayer
9f06bd9e96 Do not try to duplicate packets that have data==NULL. 
Originally committed as revision 16483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 20:44:23 +00:00
Ronald S. Bultje
6e5f27ca80 Fix typo ("Standard-compliant" -> "Standards-compliant"), as noticed by 
Diego.

Originally committed as revision 16475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 16:01:15 +00:00
Ronald S. Bultje
70d4b8ce50 Fix doxy comments missing one '*'. 
Originally committed as revision 16473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 15:13:27 +00:00
Ronald S. Bultje
7a86bafa20 Use the "server" RTSP field to detect whether the server that we're talking 
to is a Microsoft Windows Media Server (the field will be "WMServer/version").
See "[PATCH] RTSP-MS 3/15: Add Windows Media Server type" thread on
mailinglist.

Originally committed as revision 16472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:55:47 +00:00
Ronald S. Bultje
74272b1c0c Export RTSPState and RTSPStream from rtsp.c into rtsp.h. This allows future 
access to these structures in functions that will be located in rtp_asf.c.
See "[PATCH] RTSP-MS 2/15: export RTSPState and RTSPStream" mailinglist
thread.

Originally committed as revision 16471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:53:04 +00:00
Ronald S. Bultje
b0d75d6036 Don't use s->pb if a local ByteIOContext was already provided by the calling 
function. See mailinglist thread "[PATCH] RTSP-MS 1/15: don't use s->pb in
asf.c".

Originally committed as revision 16470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:50:19 +00:00
Ronald S. Bultje
572c6a3814 Allow subscription to any of the streams, not just the first, available in 
this RTSP/RDT session. This basically implies full RDT support, including
stream selection in ffmpeg and multi-stream backupping in ffmpeg (by mapping
each stream to an output). See "[PATCH] RTSP/RDT: subscriptions" thread on
mailinglist.

Originally committed as revision 16469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:48:17 +00:00
Ronald S. Bultje
7c68a17754 Parse the OpaqueData field for every AVStream represented by this "set of 
streams" (a single RTSPStream / RDTDemuxContext can represent several
AVStreams, that's just how Real/RDT was designed...). This will fill in
most of the AVStream/AVCodecContext header fields, similar to reading a
RM file header would. See "[PATCH] multi-stream MDPR parsing" thread on
mailinglist.

Originally committed as revision 16468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:45:13 +00:00
Ronald S. Bultje
530bca9439 Parse the bitrate field in the ASMRuleBook ("AverageBandwidth") to fill in 
the AVStream->AVCodecContext->bit_rate field, which is not in the MDPR block
(the "OpaqueData" SDP field). This allows clients to choose streams based
on their bitrate, which is what most network-players base stream selection
on. (Of course, it is also possible to select based on anything else, that
is entirely up to the client.) See "[PATCH] rdt.c: ASM rulebook bitrate
reading" thread on mailinglist.

Originally committed as revision 16467 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:41:40 +00:00
Ronald S. Bultje
3ca45429fe Parse the ASMRuleBook SDP line to dynamically create one new AVStream for 
each "rule" described in the ASMRuleBook. Each rule represents a stream
of identical content compared to other streams in the same rulebook, but
with a possibly different codec/bitrate/etc. See "[PATCH] rdt.c: ASM
rulebook parsing and AVStream creation" thread on mailinglist.

Originally committed as revision 16466 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:38:44 +00:00
Diego Biurrun
3a8e375acf Remove inappropriate const qualifier from function argument, fixes the warning: 
libavformat/dvenc.c:256: warning: passing argument 2 of ‘av_fifo_generic_write’ discards qualifiers from pointer target type

Originally committed as revision 16460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 01:19:48 +00:00
Aurelien Jacobs
094d9df72e free all allocated metadata structures 
Originally committed as revision 16457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 22:11:04 +00:00
Diego Biurrun
ec0052760e cosmetics: alphabetical order 
Originally committed as revision 16454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 17:50:10 +00:00
Aurelien Jacobs
7cfe7d77a4 ignore year=0 and track=0 
Originally committed as revision 16452 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 12:56:21 +00:00
Aurelien Jacobs
176aee8282 Add a metadata compatibility layer, so that when a user application set 
metadata using old API, it is automatically converted to new API before
muxing.

Originally committed as revision 16447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 00:09:23 +00:00
Aurelien Jacobs
e232c2529e add a typedef for AVMetadata 
Originally committed as revision 16446 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 23:56:27 +00:00
Diego Biurrun
52e57500bb Revert deprecation of AVFrac structure. Attempts to replace AVFrac have turned 
out to be unsatisfying and confidence in AVFrac has been restored.

Originally committed as revision 16441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 22:10:16 +00:00
Roman Shaposhnik
6d8b21f3e8 additional recovery for the badly broken streams 
Originally committed as revision 16438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 17:50:13 +00:00
Aurelien Jacobs
bc1d2afb37 rename AVMetaData to AVMetadata and meta_data to metadata 
Originally committed as revision 16430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 23:31:31 +00:00
Aurelien Jacobs
f526adaf19 add metadata in AVStream, AVProgram and AVChapter 
Originally committed as revision 16428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 22:31:55 +00:00
Mike Melanson
ea29242cc7 Ministry of English Composition treatment for the new metadata API 
Originally committed as revision 16427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 20:47:09 +00:00
Michael Niedermayer
06a7bd9a2e 10l format include path for metadata.h 
Originally committed as revision 16426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 19:00:35 +00:00
Michael Niedermayer
a6d18a0e6a Move metadata API from avcodec to avformat. 
Originally committed as revision 16425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 18:58:49 +00:00
Michael Niedermayer
47146dfbf6 Generic metadata API. 
avi is updated as example.
No version bump, the API still might change slightly ...
No update to ffmpeg.c as requested by aurel.

Originally committed as revision 16424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 18:48:37 +00:00
Yoav Steinberg
853a97530e If we find a VBR tag at the beginning of the file don't attempt to 
parse it as a valid frame.
patch by (Yoav Steinberg yoav out monfort in co in il)

Originally committed as revision 16421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 16:23:18 +00:00
Stefano Sabatini
1ca9133fb4 Drop the deprecated parse_image_size() and parse_frame_rate() functions 
at the next libavformat major version bump.

Originally committed as revision 16420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 11:04:02 +00:00
Michael Niedermayer
ce0453aac9 10l set AVPacket.size to the true size of the returned data instead of 
the (larger) allocated size. (prevents segfaults due to later failures
from 900MB-sized packets, yes fuzzed file not a valid one)

Originally committed as revision 16404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 02:47:54 +00:00
Michael Niedermayer
188e67eaf4 Fix indention which was off by 1 space. 
Originally committed as revision 16403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 01:54:54 +00:00
Michael Niedermayer
0b4ff0c9ef Replace buffer by AVPacket and avoid a memcpy() for video when the number 
of allocated slices matches the actual.
Audio still does a copy (marked with FIXME in the code so this is not missed).

Originally committed as revision 16402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 01:53:12 +00:00
Michael Niedermayer
fce48f5b0b Merge videobuf and audiobuf. 
Originally committed as revision 16401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 00:24:54 +00:00
Michael Niedermayer
f48d545736 Simplify the top of rm_assemble_video_frame(). 
Originally committed as revision 16400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 21:23:02 +00:00
Michael Niedermayer
e45673cb3a Add a few error checks to rm_assemble_video_frame() 
Originally committed as revision 16399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 20:51:18 +00:00
Michael Niedermayer
51d6852f43 All non zero returns of rm_assemble_video_frame() are errors, check things 
accordingly.

Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 19:49:27 +00:00
Reimar Döffinger
7d204e67e8 av_free() -> av_freep(), patch by Reimar Doffinger, see discussion in 
"rmdec.c: double free" thread on mailinglist.

Originally committed as revision 16379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 23:25:17 +00:00
Ronald S. Bultje
c49a3ec30a Fix double free which happens for playback of .rm files after r16365. See 
"rmdec.c: double free" discussion on mailinglist, patch with suggestions
from Reimar Doffinger.

Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 23:23:59 +00:00
Kostya Shishkov
5b3658f73b Fix a typo that made VMD demuxer always assume Indeo 3 as video codec. 
Spotted by Robert Swain

Originally committed as revision 16371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 16:22:42 +00:00
Ronald S. Bultje
ade8fb4d75 Reindent after r16368. 
Originally committed as revision 16369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:59:11 +00:00
Ronald S. Bultje
a9f84821c5 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in 
"[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:58:23 +00:00