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

4469 Commits

Author SHA1 Message Date
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
Ronald S. Bultje
5d88c2647d Change audio_pkt_cnt from an array into a single field, since only a single 
member of the array is ever used (compare to RMDemuxContext->audio_pkt_cnt).
See "[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:55:09 +00:00
Ronald S. Bultje
886e89d0d0 Add RMStream object as function argument to public functions so that non-.rm 
AVStreams can be used to call these public rmdec.c functions as well, as is
the case for RDT/RTSP streams. See mailinglist discussion in "[PATCH] rdt.c:
don't reuse the same AVStream in both RTSP and RM demuxer" thread.

Originally committed as revision 16366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 00:21:11 +00:00
Ronald S. Bultje
ba61472911 Implement RMStream stream-specific private data object in the RM demuxer. 
This allows multiple video or audio streams per .rm file. See mailinglist
thread "[PATCH] rmdec.c: implement RMVideo/AudioStream".

Originally committed as revision 16365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 00:18:38 +00:00
Kostya Shishkov
10f35ebddd Latest Coktel Vision VMDs contained Indeo 3, add demuxer support for it 
Originally committed as revision 16363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-27 17:34:00 +00:00
Ben Littler
c26436ec46 add amr in avi riff tags 
Originally committed as revision 16303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-24 02:20:07 +00:00
Carl Eugen Hoyos
9f2ace74ef Fix two identical warnings when compiling riff.c and nuv.c with icc: 
warning #188: enumerated type mixed with another type

Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:12:44 +00:00
Carl Eugen Hoyos
1c53290b67 Fix a warning when compiling with icc: 
warning #188: enumerated type mixed with another type

Originally committed as revision 16280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:10:07 +00:00
Aurelien Jacobs
9daa4ceaa3 Initialize s->opaque before calling url_resetbuf(). 
Fixes a regression test crash for icc 10.1 64 bit.

Patch by Aurelien.

Originally committed as revision 16271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 11:23:00 +00:00
Michael Niedermayer
c96bd21227 Change mpeg audio parser so it only sets frame_size, channels and bit_rate 
after it has a few valid frames.
Fixes issue762

Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 23:50:16 +00:00
Michael Niedermayer
2f3d7ea974 Fix detection of audio codec in K70707-ARIA229.flv. 
Fixes issue760.

Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 20:56:30 +00:00
Alexander Strange
1ca610c015 Allocate and clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of mkv 
extradata.

Fixes valgrind invalid read warnings during H.264 extradata parsing.

Originally committed as revision 16229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-19 01:00:44 +00:00
Baptiste Coudurier
364df7b7b9 cosmetics, remove useless parenthesis and whitespaces 
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:18:43 +00:00
Baptiste Coudurier
a15328249d set alac channels from extradata, fix alac mono in m4a 
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:17:19 +00:00
Ronald S. Bultje
1d217cdb3f Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and 
give them a ff_ prefix. See "[PATCH] asf.c: make functions of interest for
MS-RTSP public" thread on ML.

Originally committed as revision 16205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 01:28:29 +00:00
Ronald S. Bultje
d7fb5a18fc Add a ByteIOContext argument to ASF functions that will be shared with the 
RTSP stack for RTSP-MS support. This way, they can read input from any given
input source. See discussion in "[PATCH] add gb argument to ASF functions of
interest to MS-RTSP" ML thread.

Originally committed as revision 16204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 01:25:43 +00:00
Benoit Fouet
8b2386dc5a Add jp2 support to img2 demuxer. 
On behalf of Jai Menon

Originally committed as revision 16187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 11:22:51 +00:00
Baptiste Coudurier
18cb36fd57 activate jpeg2000 fourcc in mov/mj2 
Originally committed as revision 16185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 08:09:09 +00:00
Michael Niedermayer
ca5b528ea1 Fix bug where the avi demxuer lost the first frame of malformed 
ODML avis.
Fixes VS2k5DebugDemo-01-partial.avi

Originally committed as revision 16167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 16:14:07 +00:00
Baptiste Coudurier
271344377a check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure 
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 08:47:28 +00:00
Ben Littler
f86cd76138 add MPNG fourcc 
fixes http://sceneish.ath.cx/stuff/netmap/netmap.avi

Originally committed as revision 16163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:22:53 +00:00
Ben Littler
4a49a5fdfc two more mpeg4 fourccs and one msmpeg4v3 from uncommon codec list 
Originally committed as revision 16162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:20:11 +00:00
Ben Littler
a9cf309b96 QIVG fourcc, fixes http://rodweb.dip.jp/partner/check.avi 
Originally committed as revision 16161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:49:26 +00:00
Ben Littler
c6340f86a3 add rpza avi fourcc 
Originally committed as revision 16160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:42:10 +00:00
Ronald S. Bultje
b9b2b8c93b Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread 
"[PATCH] rmdec.c: use get_buffer and skip_bytes instead of loops of get_byte".

Originally committed as revision 16139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:26:28 +00:00
Ronald S. Bultje
127ed7b07b Reindent something that looks weird. 
Originally committed as revision 16138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:24:58 +00:00
Ronald S. Bultje
b965ff352f Add comment to indicate why the SDP line buffer is as big as it is. 
Originally committed as revision 16137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:23:59 +00:00
Ronald S. Bultje
e322d3f5be Increase SDP line buffer size because ASF headers in RTSP-MS are very big. See ML discussion 
in "rtsp.c: increase SDP line buffer size" thread.

Originally committed as revision 16136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 22:23:14 +00:00
Michael Niedermayer
a3bb564ee5 10l (forgot sample_size) 
Should fix fate.

Originally committed as revision 16133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 20:38:05 +00:00
Stefano Sabatini
7a961a46ba Make register_avcodec() call avcodec_init(). 
This avoids the possibility to use a registered codec without first
initializing libavcodec, which resulted in unexpected behavior.

Originally committed as revision 16131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 20:04:00 +00:00
Måns Rullgård
eedfe2227a oggflac: fix bitstream reader usage 
Originally committed as revision 16129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 17:30:18 +00:00
Michael Niedermayer
25983dcd53 Fix non interleaved variable fps ODML avis. 
Fixed issue738

Originally committed as revision 16127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 15:48:48 +00:00
Michael Niedermayer
492322fccc Remove silly FIXME comment. 
Originally committed as revision 16122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 14:01:12 +00:00
Mike Melanson
02fb2546e8 The POSIX namespace shall be held sacrosanct. To that end, 
continue eliminating _t from structure names in FFmpeg.

Originally committed as revision 16118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 03:29:33 +00:00
Luca Abeni
be73a544af Rename rtp_payload_data_t to avoid clashes with the POSIX namespace 
Originally committed as revision 16115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 23:25:19 +00:00
Luca Abeni
1afe09d515 Remove useless typedef 
Originally committed as revision 16114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 23:20:05 +00:00
Luca Abeni
d5574b2839 Remove unused types 
Originally committed as revision 16113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 23:03:34 +00:00
Reimar Döffinger
d77ac324fe Avoid _t in gxf enum type names 
Originally committed as revision 16112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 21:58:17 +00:00
Ronald S. Bultje
1edddc99dc Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c. 
Reason for this is that there are no shared entries in the demuxer/muxer
context, making it a mystery as to why it was shared between the two. See
"[PATCH] clean rmdemux/muxcontext" patch on mailinglist.

Originally committed as revision 16111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 21:40:20 +00:00
Ronald S. Bultje
a15ebf34c7 Don't access RMContext directly in rdt.c. Rather, use the return value of 
ff_rm_parse_packet() to indicate whether more audio packets are available
in the demuxer from the last RM frame, and save that in the RDT parsing
context. See patch/discussion in "[PATCH] rdt.c: don't access RMContext"
on ML.

Originally committed as revision 16110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 21:37:27 +00:00
Ronald S. Bultje
f27544fd5b Separate the packet fetching from the data reading, so that the data reading 
function is assured to parse at most one packet. This makes this function
useful for ASF data packet parsing in a "push-mode" in addition to the
current "pull-mode", and therefore allows for use of these functions in,
for example, the RTSP demuxer (for MS-RTSP support). Tested to give identical
output before and after for regular ASF playback, also see discussion in the
ML thread "[PATCH] asf.c: move packet_time_start=0 statement". Testsuite also
works after the patch, tested by Benoit Fouet.

Originally committed as revision 16108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 17:18:11 +00:00
Diego Biurrun
8a9572c26f 100l: Add missing backslashes. 
Originally committed as revision 16107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 17:04:22 +00:00
Diego Biurrun
6d99b2285d cosmetics: Break some lines for a more aesthetically pleasing result. 
Originally committed as revision 16106 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 16:35:58 +00:00
Diego Biurrun
3445c7992b Remove misleading comment, _t is POSIX-reserved namespace. 
Originally committed as revision 16105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 16:08:31 +00:00
Diego Biurrun
7f37f5687d whitespace cosmetics 
Originally committed as revision 16100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 13:39:13 +00:00
Jai Menon
f98dcdedda Avoid _t in identifier names, _t is reserved by POSIX. 
patch by Jai Menon, jmenon86 gmail com

Originally committed as revision 16098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 13:11:42 +00:00
Anders Grönberg
b77aba0a8c Matroska uses tables from isom.c, so add the object file to its dependencies. 
extracted from a patch by Anders Grönberg, galileo.m2 gmail com

Originally committed as revision 16096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 12:46:11 +00:00
Luca Barbato
644e7acba4 Rename type to be consistent 
Originally committed as revision 16090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 10:45:44 +00:00
Måns Rullgård
8c39a7582d mpegts: replace Program_t typedef with "struct Program" 
Originally committed as revision 16086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 00:04:34 +00:00
Aurelien Jacobs
737dccfc1d matroska: sort codec tags list 
Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 16:04:15 +00:00
Kurtnoise
ea2a5dec33 matroska: add dirac support (patch by Kurtnoise kurtnoise _at_ free _dot_ fr) 
Originally committed as revision 16080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 15:55:08 +00:00
Ben Littler
41b0534a7a add another mpeg4 avi fourcc from uncommon codecs list 
Originally committed as revision 16079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 15:34:55 +00:00
Dave Yeo
c0a8f8d498 Add sys/time.h header #include, fixes compilation on OS/2. 
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 16077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 06:55:48 +00:00
Oded Shimon
bffc76bd17 Update lavf/libnut.c to _tt type names in libnut API 
Originally committed as revision 16075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 05:10:43 +00:00
Aurelien Jacobs
e998ba4fbc avoid POSIX reserved _t suffix 
Originally committed as revision 16067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 22:34:14 +00:00
Baptiste Coudurier
6da5407401 parse pasp atom and set sample aspect ratio, 
warn if transformation matrix differs from pasp,
based on a patch by Skal.

Originally committed as revision 16066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 22:24:56 +00:00
Baptiste Coudurier
c3e92a6cb4 remove _t in typedef for POSIX compatibility 
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:06:56 +00:00
Michael Niedermayer
089e1bcf10 Remove comment suggesting using variables ending in _t as this would break POSIX. 
Originally committed as revision 16061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:02:15 +00:00
Reimar Döffinger
b4be93212f Avoid _t in typedef type 
Originally committed as revision 16058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 19:19:23 +00:00
Michael Niedermayer
52afa376b8 remove _t for POSIX compatibility. 
Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 19:06:24 +00:00
Ronald S. Bultje
76f940b21e Fix indenting. 
Originally committed as revision 16056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 18:48:08 +00:00
Reimar Döffinger
4e5b854e4c Use "struct gxf_stream_info" instead of "st_info_t", 
avoids a typedef that is not really worth it and the
reserved POSIX _t namespace.

Originally committed as revision 16054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 10:42:06 +00:00
Reimar Döffinger
c370a7040b Remove useless and confusing (since they are also used in gxfenc.c) /* gxf.c */ comment. 
Originally committed as revision 16053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 10:35:20 +00:00
Mike Melanson
65fec2d98f add 'ACDV' FourCC (which is just complete JPEG files in individual AVI 
frames) and 'azpr' FourCC (which is Apple's 'rpza', encapsulated in AVI
instead)

Originally committed as revision 16052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 07:49:05 +00:00
Ben Littler
6cffaea8db add mpeg2 fourcc and aac format tag from asf 
Originally committed as revision 16036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-08 20:09:15 +00:00
Jindřich Makovička
36b532815c bind to the multicast address if possible 
Originally committed as revision 16032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-07 17:29:09 +00:00
Reynaldo H. Verdejo Pinochet
7100376f75 COSMETICS 
Originally committed as revision 16028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-07 01:53:31 +00:00
Ronald S. Bultje
dc50773dc5 Remove static variable and a printf using it. See "[PATCH] asf.c: move 
packet_time_start=0 statement" thread on ML.

Originally committed as revision 16025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-06 20:28:38 +00:00
Ronald S. Bultje
7b2a070800 Change function prototype of the sdp_parse_a_line in DynamicProtocolHandler. 
This function is called in rtsp.c for each a= line in the SDP of the Describe
response after m= RTSP stream descriptors. The function prototype used to
take an AVStream argument. For RDT, however, every RTSPStream represents
a set of streams of identical content, and can thus represent multiple
AVStreams. Therefore, it should not take an AVStream as argument. This
patch modifies it to accept a AVFormatContext (of the RTSP/SDP demuxer)
instead. See discussion in "[PATCH/RFC] change function prototype of
parse_sdp_a_line" thread on ML.

Originally committed as revision 16024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-06 18:41:17 +00:00
Ronald S. Bultje
022f0b7c01 Do not access s->gb directly in functions that have a local copy of that 
variable. See "[PATCH] asf.c: don't access AVFormatContext->pb" thread on
ML.

Originally committed as revision 16023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-06 18:35:52 +00:00
Ben Littler
62d6f73edc add VX1K h263 and DMK2 mpeg4 avi fourccs 
Originally committed as revision 16009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-05 14:59:41 +00:00
Carl Eugen Hoyos
485cfbe806 Recognize pnm file as images. 
Originally committed as revision 16004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-04 15:08:04 +00:00
Baptiste Coudurier
4d35964d01 WRAW fourcc 
Originally committed as revision 16001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-04 03:00:53 +00:00
Diego Biurrun
ecfb51d1c2 Add necessary header for av_set_program_name and av_program_add_stream_index. 
Originally committed as revision 15996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 23:04:30 +00:00
Ben Littler
26e8d342c0 add fourccs from avi files 
Originally committed as revision 15995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 21:44:29 +00:00
Michael Niedermayer
b8cf645bd2 add GEOX fourcc for mpeg4 
Originally committed as revision 15992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 16:49:58 +00:00
Diego Biurrun
bad4063740 Move declaration of av_set_program_name and av_program_add_stream_index 
to a more sensible place.

Originally committed as revision 15991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 16:47:07 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Ben Littler
26ae363e06 add FFDS fourcc, ok'd by kostya 
fixes FFDS files in http://tranquillity.ath.cx/uncommon_video_codecs_final.txt

Originally committed as revision 15989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 13:53:13 +00:00
Kenan Gillet
73b458e354 Commit last ok'ed parts of QCELP decoder and enable it. 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-02 16:48:05 +00:00
Michael Niedermayer
2ba0cdd527 ADTS AAC probe. 
fixes issue400

Originally committed as revision 15977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-02 15:43:47 +00:00
Kenan Gillet
061f407e53 More OKed parts of the QCELP decoder 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 22:07:00 +00:00
Ronald S. Bultje
7960e18fdf Implement rule-number parsing, the initial step in stream (and bitrate) 
selection. See discussion in ML thread "[PATCH] RDT/Realmedia patches #2".

Originally committed as revision 15966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 00:08:42 +00:00
Ronald S. Bultje
4f60285658 Change RDTDemuxContext->st into an array of streams, which will make future 
patches adding stream-selection easier in code. See discussion in ML thread
"[PATCH] RDT/Realmedia patches #2".

Originally committed as revision 15964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-30 22:24:35 +00:00
Ronald S. Bultje
79a1f3c023 document ff_rdt_parse_open(). See ML discussion in "[PATCH] RDT/Realmedia 
patches #2" thread.

Originally committed as revision 15963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-30 20:40:04 +00:00
Ronald S. Bultje
e0d1eabf14 Change function prototype from taking an AVStream to taking an index to the 
stream itself, plus a name change to signify that there may be multiple
AVStreams per RDT set. See discussion in "[PATCH] RDT/Realmedia patches #2"
thread on ML.

Originally committed as revision 15962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-30 20:39:16 +00:00
Stefano Sabatini
91cd7eb633 Rename functions in sdp.c for consistency's sake. 
Originally committed as revision 15953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-29 13:55:03 +00:00
Ronald S. Bultje
63f412f902 Document 'ic' variable. See "[PATCH] RDT/Realmedia patches #2" thread in ML. 
Originally committed as revision 15916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-23 16:54:31 +00:00
Carl Eugen Hoyos
a8e4161333 Add forgotten file format pgmyuv. 
Originally committed as revision 15910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-22 21:24:39 +00:00
Carl Eugen Hoyos
6bbb5bf83c Support picture output without -f image2 for most codecs. 
Originally committed as revision 15909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-22 20:36:02 +00:00
Diego Biurrun
f0e602351e cosmetics: Consistently place HEADERS before OBJS in all Makefiles. 
Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-20 22:53:18 +00:00
Baptiste Coudurier
12e416c848 decrease atom size, fix broken files missing version/flags 
Originally committed as revision 15872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-18 09:09:57 +00:00
Reynaldo H. Verdejo Pinochet
a45bdbc4f5 Trivial, Cosmetics 
Originally committed as revision 15871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-18 03:49:33 +00:00
Ronald S. Bultje
9168f7e671 Change type of prev_stream_id from uint32_t to int, since it has a max size 
of 16bits. See discussion in "[PATCH] RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 18:10:02 +00:00
Ronald S. Bultje
90e0450fa8 Reindent after r15853. 
Originally committed as revision 15854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 14:32:56 +00:00
Ronald S. Bultje
43af8b2b42 Read optional components of the RDT packet header, such as extended setID 
and streamID and the length. of the packet in case of packet concatenation.
Discussed in ML thread "[PATCH] RDT/Realmedia patches #2".

Originally committed as revision 15853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 14:32:01 +00:00
Ronald S. Bultje
6bafd6f53e Change header reading implementation to using get_bits() instead of directly 
accessing the data array. This allows to easily read optionally available
header bits without causing pains. See discussion in "[PATCH] RDT/Realmedia
patches #2" thread on ML.

Originally committed as revision 15852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 14:30:31 +00:00
Ronald S. Bultje
e269ab791d Prefix all ff_rdt_parse_header() arguments with a p, preparing for local 
variables to temporary hold the values. Discussed in ML thread "[PATCH]
RDT/Realmedia patches #2".

Originally committed as revision 15851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 14:28:12 +00:00
Ronald S. Bultje
a4b8cb3c55 Fix memleak caused by the fact that url_open_buf() allocates a context 
when calling, but url_close_buf() doesn't free it. The better solution
is to not allocate it at all, init it with init_put_byte() and then
not have to close it at all. In the case where we do need to hold it
around for longer than within the function context, we allocate it with
av_alloc_put_byte() and free it with av_free() instead. Discussed in ML
thread "[PATCH] fix small memleak in rdt.c".

Originally committed as revision 15850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 14:23:20 +00:00
Ronald S. Bultje
fcc995a533 Add ByteIOContext argument to public ff_rm_* functions so that we can 
specify the data source as function argument instead of in s->pb before
calling the function. Discussed in ML thread "[PATCH] fix small memleak
in rdt.c".

Originally committed as revision 15849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 14:20:00 +00:00
Jindřich Makovička
ce09d560b7 Get rid of MSG_DONTWAIT using a more standard way to use a socket 
in a non blocked mode.
Patch by Jindrich Makovicka: makovick gmail

Originally committed as revision 15846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 07:50:25 +00:00
Baptiste Coudurier
ebd610557e set pts in flv demuxer 
Originally committed as revision 15841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-16 02:56:34 +00:00
Baptiste Coudurier
51c1520114 read itunes metadata, code based on Reimar's patch 
Originally committed as revision 15840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-16 01:59:35 +00:00
Ronald S. Bultje
e3b7216b9b Change status packet skipping to be more spec-compliant. See discussion in 
"[PATCH] RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:45:26 +00:00
Ronald S. Bultje
108cd24793 Make function comment a bit more linguistically correct. 
Originally committed as revision 15835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:43:57 +00:00
Ronald S. Bultje
3d883ad5f3 Reindent after r15833. 
Originally committed as revision 15834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:42:41 +00:00
Ronald S. Bultje
114732f4c7 Add is_keyframe param to ff_rdt_parse_header(). See ML discussion in 
"[PATCH] RDT/Realmedia patches #2" thread.

Originally committed as revision 15833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:41:59 +00:00
Baptiste Coudurier
86b0affd08 simplify metadata reading 
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:17:19 +00:00
Aurelien Jacobs
8f569ed08f matroskadec: fix index timestamps for some broken files 
fix issue697

Originally committed as revision 15829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 15:34:51 +00:00
Ronald S. Bultje
6ff1f61530 Call check_back_and_send_rr() function only in case of RTP as a transport. 
Don't call it for RDT, since it is unneeded and it doesn't provide a
RTPDemuxContext, leading to some memory errors. See "[PATCH] fix small
memory error in rtsp.c" thread on ML.

Originally committed as revision 15828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 14:44:48 +00:00
Ronald S. Bultje
239dec21ab Rename variables in ff_rdt_parse_header() and callers to match the 
comment documentation in that function. See discussion on ML in the
"[PATCH] RDT/Realmedia patches #2" thread.

Originally committed as revision 15825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 02:22:47 +00:00
Jindřich Makovička
7d0842992a check for interrupt when receiving from socket 
Originally committed as revision 15824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-14 19:33:22 +00:00
Ronald S. Bultje
9e16439287 Add comment describing the RDT packet header. See discussion in "[PATCH] 
RDT/Realmedia patches #2" thread on the mailinglist.

Originally committed as revision 15823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-14 18:37:58 +00:00