summaryrefslogtreecommitdiff
path: root/libavformat/asf.c
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 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>
* 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>
* | 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>
* | Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48a4ffa722c0874b251de9d201babed52cef0bcb': asf: K&R formatting cosmetics vc1dec: use codec_id instead of codec_tag for VC1IMAGE sh4: drop unused functions Conflicts: libavformat/asf.c libavformat/asfdec.c libavformat/asfenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: K&R formatting cosmeticsDiego Biurrun2013-02-06
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * asf/wtv: use service_provider and service_name metadata tagsRonald S. Bultje2011-01-31
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * 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>
* | Do not map asf metadata key WM/Track to track.Carl Eugen Hoyos2011-12-31
| | | | | | | | | | | | | | WM/Track is 0-based (and deprecated in favour of WM/TrackNumber), track is 1-based. Fixes ticket #825.
* | asf/wtv: use service_provider and service_name metadata tagsRonald S. Bultje2011-01-31
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 45430099438d7b4f70ebb23611a29d318ba49687)
* | 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)
* asf: Add asf_jfif_media guidMartin Storsjö2010-07-20
| | | | Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove superfluous space from a conversion table.Anton Khirnov2010-03-31
| | | | | | Patch by Anton Khirnov, wyskas gmail Originally committed as revision 22741 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
* asf: indent.Benoit Fouet2010-02-25
| | | | | | Patch from Anton Khirnov wyskas gmail com Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk
* asf: add more entries to metadata conv table.Benoit Fouet2010-02-25
| | | | | | Patch from Anton Khirnov wyskas gmail com Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Don't add WM prefixes to all written ASF tags.Anton Khirnov2010-02-24
| | | | | | Patch by Anton Khirnov <wyskas gmail com>. Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a list of generic tags and change demuxers to follow it.Anton Khirnov2010-02-01
| | | | | | Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 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
* 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
* rename asf-enc.c to asfenc.c and asf.c to asfdec.c for consistencyAurelien Jacobs2009-02-26
| | | | Originally committed as revision 17618 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Re-indent after last commitAlex Converse2009-02-19
| | | | Originally committed as revision 17467 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC in ASF does not need parsing.Alex Converse2009-02-19
| | | | Originally committed as revision 17466 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a context to av_log() calls.Benoit Fouet2009-02-16
| | | | Originally committed as revision 17374 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use new metadata API in asf demuxerAurelien Jacobs2009-02-03
| | | | Originally committed as revision 16977 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
* Don't use s->pb if a local ByteIOContext was already provided by the callingRonald S. Bultje2009-01-07
| | | | | | | 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
* 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
* Add a ByteIOContext argument to ASF functions that will be shared with theRonald S. Bultje2008-12-18
| | | | | | | | 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
* Separate the packet fetching from the data reading, so that the data readingRonald S. Bultje2008-12-13
| | | | | | | | | | | | 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
* Remove static variable and a printf using it. See "[PATCH] asf.c: moveRonald S. Bultje2008-12-06
| | | | | | packet_time_start=0 statement" thread on ML. Originally committed as revision 16025 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not access s->gb directly in functions that have a local copy of thatRonald S. Bultje2008-12-06
| | | | | | | 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
* Delete unnecessary 'extern' keywords.Diego Biurrun2008-12-03
| | | | Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
* timestamp is dts in wmv/asfBaptiste Coudurier2008-11-14
| | | | Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use enum typers instead of int.Diego Pettenò2008-10-02
| | | | | | Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bump Major version, this commit is almost just renaming bits_per_sample toLuca Abeni2008-09-08
| | | | | | | | | | | bits_per_coded_sample but that cannot be done seperately. Patch by Luca Abeni Also reset the minor version and fix the forgotton change to libfaad. Note: The API/ABI should not be considered stable yet, there still may be a change done here or there if some developer has some cleanup ideas and patches! Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
* convert every muxer/demuxer to write/read sample_aspect_ratio from/toAurelien Jacobs2008-08-23
| | | | | | the corresponding AVStream instead of AVCodecContext Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ASF: use dprintf(), allow compilation with -DDEBUGMåns Rullgård2008-07-13
| | | | Originally committed as revision 14210 to svn://svn.ffmpeg.org/ffmpeg/trunk
* New codec probing system try #1.Michael Niedermayer2008-07-12
| | | | Originally committed as revision 14184 to svn://svn.ffmpeg.org/ffmpeg/trunk
* command_streams are type data not unknown.Michael Niedermayer2008-07-12
| | | | Originally committed as revision 14183 to svn://svn.ffmpeg.org/ffmpeg/trunk
* uniformize AVStream->priv_data freeing in av_close_input_streamBaptiste Coudurier2008-06-20
| | | | Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
* factorize read_header failure freeing codeBaptiste Coudurier2008-06-20
| | | | Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.Stefano Sabatini2008-06-03
| | | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste.it along with some spelling/consistency fixes for the long names by me Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 07:02:36 +0000