939bfc87ee
asf/wtv: use service_provider and service_name metadata tags
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4543009943
2011-01-31 18:25:47 +01:00
6e89b61293
lavf: move ff_put_str16_nolen from asf to avio and rename it
...
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dccbd97d72
2011-01-23 19:32:06 +01:00
7428c8f599
asf: Add asf_jfif_media guid
...
Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 11:50:22 +00:00
8166c498df
Remove superfluous space from a conversion table.
...
Patch by Anton Khirnov, wyskas gmail
Originally committed as revision 22741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 09:22:31 +00:00
852e0ca555
Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
...
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
2010-03-24 18:40:43 +00:00
88b51ea948
Use ASF supports "markers" which are a name and a time stamp to create
...
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
2010-03-08 13:13:18 +00:00
a5517dcc9a
asf: indent.
...
Patch from Anton Khirnov wyskas gmail com
Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:10:37 +00:00
9b54f4328e
asf: add more entries to metadata conv table.
...
Patch from Anton Khirnov wyskas gmail com
Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:09:39 +00:00
a106d4112d
Don't add WM prefixes to all written ASF tags.
...
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:17:32 +00:00
ca76a11948
Add a list of generic tags and change demuxers to follow it.
...
Patch by Anton Khirnov, wyskas at gmail dot com
Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
febd1c90a6
Detect Windows Media DRM protected files and display warning if no key
...
was provided.
Patch by Daniel G. Taylor, dan programmer-art org
Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-11 23:09:33 +00:00
5f1ac36dd2
Per-stream language-tags extraction in asfdec.
...
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
2009-05-12 12:35:46 +00:00
b8b00d9429
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
...
(GUID is also defined, but differently, in Windows headers).
Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-18 14:03:40 +00:00
719e721a14
Add some basic metadata conversion tables for matroska and asf.
...
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.
Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 00:12:08 +00:00
17af052531
move static tables from asf.h to non-static tables in asf.c
...
this avoid getting those tables duplicated in asfenc.o and asfdec.o
Originally committed as revision 17619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 16:17:17 +00:00
5e293c424d
rename asf-enc.c to asfenc.c and asf.c to asfdec.c for consistency
...
Originally committed as revision 17618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 15:44:19 +00:00
e9259f8d18
Re-indent after last commit
...
Originally committed as revision 17467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 23:24:41 +00:00
e7f73adbb8
AAC in ASF does not need parsing.
...
Originally committed as revision 17466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 23:23:53 +00:00
871e62e529
Add a context to av_log() calls.
...
Originally committed as revision 17374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 16:09:02 +00:00
20e2a7aed2
use new metadata API in asf demuxer
...
Originally committed as revision 16977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 22:12:06 +00:00
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
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
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
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
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
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
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
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
eb63b051c0
timestamp is dts in wmv/asf
...
Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 03:45:31 +00:00
fb65d2ca84
Use enum typers instead of int.
...
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail
Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +00:00
dd1c8f3e6e
Bump Major version, this commit is almost just renaming bits_per_sample to
...
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
2008-09-08 14:24:59 +00:00
5972945197
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
...
the corresponding AVStream instead of AVCodecContext
Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
f94981ea6a
ASF: use dprintf(), allow compilation with -DDEBUG
...
Originally committed as revision 14210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:41:07 +00:00
0bef08e516
New codec probing system try #1 .
...
Originally committed as revision 14184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 18:42:00 +00:00
3e86dba24b
command_streams are type data not unknown.
...
Originally committed as revision 14183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 16:43:46 +00:00
ade8d8b939
uniformize AVStream->priv_data freeing in av_close_input_stream
...
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:22:56 +00:00
ccafd47251
factorize read_header failure freeing code
...
Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:16:56 +00:00
bde15e74de
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
...
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
2008-06-03 16:20:54 +00:00
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
b4bbcd635f
Read asf file header fields in the right order
...
Patch by Rafaël Carré ( funman videolan org )
Originally committed as revision 12926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 20:08:39 +00:00
11c55efa34
Skip over unknown extended_content_header tags.
...
fixes issue358
Originally committed as revision 12347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:26:48 +00:00
16428e6348
simplify
...
Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:20:49 +00:00
7abe438045
Remove ff_mms_set_stream_selection again from asf demuxer,
...
it does not seem like a good solution to the problem and will
cause dependency problems if a libavprotocols should be split out.
Originally committed as revision 11827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 11:18:53 +00:00
4d65da424a
Put is_mms under ifdef CONFIG_MMSH_PROTOCOL, avoids warning:
...
libavformat/asf.c:112: warning: 'is_mms' defined but not used
Originally committed as revision 11815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 21:17:46 +00:00
3dc761a443
typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
...
Originally committed as revision 11681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:22:25 +00:00
efc90ebfcb
begining -> beginning typo fix
...
Originally committed as revision 11309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-23 18:08:00 +00:00
cd31f8dc23
cosmetics: indentation
...
Originally committed as revision 11279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 00:26:53 +00:00
fd2982a0a0
remove double check of pb->read_seek
...
Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 00:25:18 +00:00
fa13095a5d
Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
...
to use the protocol-native functionality if available.
Patch by Björn Axelsson: bjorn point axelsson at intinor dot se
Original thread: [FFmpeg-devel] [PATCH][4/4] Enable use of the extended API
Date: Thu Nov 22 16:01:06 CET 2007
Originally committed as revision 11248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-17 09:28:46 +00:00
899681cd1d
Use dynamically allocated ByteIOContext in AVFormatContext
...
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007
Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Ronald S. Bultje
Anton Khirnov
Martin Storsjö
Anton Khirnov
Zhentan Feng
Vladimir Pantelic
Benoit Fouet
Daniel G. Taylor
Cyril Comparon
Reimar Döffinger
Aurelien Jacobs
Alex Converse
Diego Biurrun
Baptiste Coudurier
Diego Pettenò
Luca Abeni
Måns Rullgård
Michael Niedermayer
Stefano Sabatini
Rafaël Carré
Björn Axelsson