summaryrefslogtreecommitdiff
path: root/libavformat/asf.h
Commit message (Collapse)AuthorAge
* avformat/asfenc: write group_mutual_exclusion_objects for audio on multiple ↵Marton Balint2016-02-21
| | | | | | | | | | | | languages Improves streaming compatibility with Windows Media Services. Also tested for compatilbility in Windows Media Player, Windows Media ASF Viewer and VLC. This version of the patch only writes exclusion among audio streams, therefore choosing a subtitle language should be possible independently of audio language. Signed-off-by: Marton Balint <cus@passwd.hu>
* lavf/asfenc: add support for setting packet sizeMarton Balint2016-02-05
| | | | | | | This can provide a manual workaround for ticket #4230. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* lavf/asfenc: add support for storing languagesMarton Balint2016-02-05
| | | | | | | | Checked compatiblity with VLC, Windows Media Player 12 and Windows Media ASF Viewer 9 series. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/asfdec_f: Add ASFDataType, use named types for metadataJohn Adlum2015-07-02
| | | | | | This is based on asfdec_o.c, but uses a proper type instead of defines Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d'Michael Niedermayer2015-06-28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b08569a23948db107e5e6175cd4c695427d5339d': lavf: Replace the ASF demuxer Conflicts: Changelog libavformat/asf.h libavformat/asfdec.c libavformat/version.h tests/ref/fate/wmv8-drm-nodec tests/ref/seek/lavf-asf The rewritten demuxer is placed in a new file, the current demuxer is left as default. Carl has tested both and the one working better is default. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Replace the ASF demuxerAlexandra Hájková2015-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old one is the result of the reverse engineering and guesswork. The new one has been written following the now-available specification. This work is part of Outreach Program for Women Summer 2014 activities for the Libav project. The fate references had to be changed because the old demuxer truncates the last frame in some cases, the new one handles it properly. The seek-test reference is changed because seeking works differently in the new demuxer. When seeking, the packet is not read from the stream directly, but it is rather constructed by the demuxer. That is why position is -1 now in the reference. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Move GUID-related objects to riffenc.c and riff.c.Carl Eugen Hoyos2014-01-29
| | | | | | | | This simplifies the following eac3-in-wav patch.
* | avformat/asf: clear uninitialized areas of packets before returning themMichael Niedermayer2013-12-13
| | | | | | | | | | | | | | Fixes use of uninitialized variables Fixes msan_uninit-mem_7f839282b6ce_7273_msn08_VBRq70_800x600.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | * commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9': asfenc: remember send time and offset of the index entries Conflicts: libavformat/asfenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfenc: remember send time and offset of the index entriesVladimir Pantelic2013-09-19
| | | | | | | | | | Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | * commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743': asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF specVladimir Pantelic2013-09-19
| | | | | | | | | | Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * riff: Move guid structs and helper functions into riffPeter Ross2013-04-21
| | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | asfdec: Skip to keyframe after seekingMichael Niedermayer2013-07-30
| | | | | | | | | | | | Fixes Ticket1616 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: move packet_obj_size to ASFStreamMichael Niedermayer2013-07-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'Michael Niedermayer2013-02-10
|\| | | | | | | | | | | | | * commit '84b721db366c0734fdfd23c8daaa7da7da21f761': asfdec: also read Metadata Library Object Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: also read Metadata Library ObjectVladimir Pantelic2013-02-09
| | | | | | | | | | | | | | | | In some ASF files this objects holds cover art and other tags. Compared to Metadata Object it can also hold GUIDs, but we ignore these for now. Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | asfdec: parse payload extension listMichael Niedermayer2012-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-06
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
* | asfenc: rename put_guid to ff_put_guidPeter Ross2011-11-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-15
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * asf: split ASFContext into muxer and demuxer parts.Anton Khirnov2011-02-09
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * asf: make ff_guidcmp inline and move it to asf.hAnton Khirnov2011-02-09
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | 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-21
| | | | | | | | | | | | 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-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | 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-11
| | | | | | | | | | 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-11
| | | | | | | | | | 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-28
| | | | | | | | | | | | 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-23
|/ | | | | | | 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-26
| | | | Originally committed as revision 26093 to svn://svn.ffmpeg.org/ffmpeg/trunk
* asf: Add asf_jfif_media guidMartin Storsjö2010-07-20
| | | | 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-24
| | | | | | | | 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-08
| | | | | | | 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-11
| | | | | | | | 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-24
| | | | | | | 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-09
| | | | | | 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-12
| | | | Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Per-stream language-tags extraction in asfdec.Cyril Comparon2009-05-12
| | | | | | | | 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-18
| | | | | | (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-01
| | | | | | 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-26
| | | | | | 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-19
| | | | 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-18
| | | | | | | 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-31
| | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 21:48:36 +0000