summaryrefslogtreecommitdiffstats
path: root/libavformat/asf.h
Commit message (Collapse)AuthorAgeFilesLines
* asfenc: rename put_guid to ff_put_guidPeter Ross2011-11-051-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-171-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * make containers pass palette change in AVPacketKostya Shishkov2011-04-151-0/+2
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * asf: split ASFContext into muxer and demuxer parts.Anton Khirnov2011-02-091-58/+0
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * asf: make ff_guidcmp inline and move it to asf.hAnton Khirnov2011-02-091-1/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
| * lavf: move ff_put_str16_nolen from asf to avio and rename itAnton Khirnov2011-01-211-1/+0
| | | | | | | | | | | | It will be useful in the mp3 muxer. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.hPeter Ross2011-04-071-9/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-1/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | asf: split ASFContext into muxer and demuxer parts.Anton Khirnov2011-02-111-58/+0
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 4bc328a2bdf96d01afd3cf4532efb9db41f00985)
* | asf: make ff_guidcmp inline and move it to asf.hAnton Khirnov2011-02-111-1/+6
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit e4e234fad77daa8628fc56155563248165d51ab4)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-281-1/+1
| | | | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* | lavf: move ff_put_str16_nolen from asf to avio and rename itAnton Khirnov2011-01-231-1/+0
|/ | | | | | | It will be useful in the mp3 muxer. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit dccbd97d72991f4df63542e1ee03db2f8d7a0238)
* make guid utility function visibile to other modules (ff_guidcmp, ff_get_guid)Peter Ross2010-12-261-0/+2
| | | | Originally committed as revision 26093 to svn://svn.ffmpeg.org/ffmpeg/trunk
* asf: Add asf_jfif_media guidMartin Storsjö2010-07-201-0/+1
| | | | Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easierZhentan Feng2010-03-241-0/+1
| | | | | | | | to share it with e.g. MMS. Patch by Zhentan Feng <spyfeng gmail com>. Originally committed as revision 22656 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use ASF supports "markers" which are a name and a time stamp to createVladimir Pantelic2010-03-081-0/+1
| | | | | | | lavf chapters. Patch by Vladimir Pantelic pan (arobase) nt tu (dash) darmstadt de Originally committed as revision 22326 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Detect Windows Media DRM protected files and display warning if no keyDaniel G. Taylor2009-10-111-0/+3
| | | | | | | | was provided. Patch by Daniel G. Taylor, dan programmer-art org Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove any reference to ASFContext.packet_size and replace it withRonald S. Bultje2009-06-241-1/+0
| | | | | | | AVFormatContext.packet_size. See "[PATCH] asf*.c/h: use AVFormatContext->packet_size instead of own copy" thread on ML. Originally committed as revision 19270 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:Ronald S. Bultje2009-06-091-19/+0
| | | | | | make get/parse_packet static" thread from 2 months ago. Originally committed as revision 19140 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix bandwith vs. bandwiDth typo.Diego Biurrun2009-05-121-1/+1
| | | | Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Per-stream language-tags extraction in asfdec.Cyril Comparon2009-05-121-0/+4
| | | | | | | | Patch by Cyril Comparon: gmail(name, surname); Original thread: Suggestion for a centralized language-tag facility in libavformat Date: 04/10/2009 07:33 PM Originally committed as revision 18800 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename GUID typedef to ff_asf_guid to fix MinGW compilation failureReimar Döffinger2009-03-181-24/+24
| | | | | | (GUID is also defined, but differently, in Windows headers). Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add some basic metadata conversion tables for matroska and asf.Aurelien Jacobs2009-03-011-0/+3
| | | | | | Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat. Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move static tables from asf.h to non-static tables in asf.cAurelien Jacobs2009-02-261-90/+22
| | | | | | this avoid getting those tables duplicated in asfenc.o and asfdec.o Originally committed as revision 17619 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS andRonald S. Bultje2008-12-181-0/+21
| | | | | | | 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
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* typo: begining --> beginningDiego Biurrun2007-12-231-1/+1
| | | | Originally committed as revision 11312 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spellingVitor Sessak2007-12-011-1/+1
| | | | Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a comment to indicate which #endif belong to which #defineGuillaume Poirier2007-06-171-1/+1
| | | | Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add multiple inclusion guards to headersMåns Rullgård2007-06-171-0/+5
| | | | Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* include all prerequisites in header filesMåns Rullgård2007-06-161-0/+4
| | | | Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add the stream_bitrate GUID to the asf parsing code, and set stream bitrateRyan Martell2007-02-201-0/+1
| | | | | | | properties accordingly. Patch by Ryan Martell, rdm4 % martellventures com. Originally committed as revision 8046 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use dvr-ms timestampsMichael Niedermayer2007-02-101-1/+1
| | | | Originally committed as revision 7905 to svn://svn.ffmpeg.org/ffmpeg/trunk
* iam pretty sure send time is dts and not pts ...Michael Niedermayer2007-02-071-1/+0
| | | | Originally committed as revision 7879 to svn://svn.ffmpeg.org/ffmpeg/trunk
* extract aspect ratioMichael Niedermayer2007-01-311-0/+4
| | | | Originally committed as revision 7791 to svn://svn.ffmpeg.org/ffmpeg/trunk
* check fragment offset and sizeMichael Niedermayer2007-01-221-2/+2
| | | | | | yes this too could have been exploitable ... Originally committed as revision 7650 to svn://svn.ffmpeg.org/ffmpeg/trunk
* doxygenize commentsMichael Niedermayer2007-01-221-29/+29
| | | | Originally committed as revision 7646 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove a few unused and duplicated variablesMichael Niedermayer2007-01-221-5/+1
| | | | Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify GUIDsMichael Niedermayer2007-01-211-28/+23
| | | | Originally committed as revision 7611 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Minor modifications to handle mms streaming.Ryan Martell2006-12-041-1/+1
| | | | | | Patch by Ryan Martell rdm4 martellventures com. Originally committed as revision 7221 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix fallback if theres no indexMichael Niedermayer2006-08-231-0/+1
| | | | | | fix index less seeking Originally committed as revision 6055 to svn://svn.ffmpeg.org/ffmpeg/trunk
* The reader ignores the size of the ASF data object and keeps onKohn Emil Dan2006-07-291-2/+4
| | | | | | | | | | | | | | | reading even beyond it. Therefore if the ASF file includes an index object at its end, the reader will treat the index like data, but of course will fail since it thinks that the data is corrupted. When reading an asf file with an index object, ffmpeg will complain at the end of the file that it read an invalid header. Patch by Kohn Emil Dan, < emild A cs P technion P ac P il > Original thead: Date: Apr 18, 2006 4:11 PM Subject: [Ffmpeg-devel] Two ASF related bugs and fixes Originally committed as revision 5857 to svn://svn.ffmpeg.org/ffmpeg/trunk
* audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)Michael Niedermayer2006-01-201-0/+12
| | | | Originally committed as revision 4874 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-121-1/+1
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud