Michael Niedermayer
133055c5e4
reverts parts of commit de11ee906e
. The author of this patch has a poor understanding of the code
2011-03-18 17:59:24 +01:00
Michael Niedermayer
4eb41d16be
Merge remote-tracking branch 'newdev/master'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-18 17:58:58 +01:00
Vladimir Pantelic
de11ee906e
asfdec: subtract the preroll value and thus output 0 based timestamps
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 16:25:54 +00:00
Anssi Hannula
c0fd48a702
lavf: document the use of multiple entries in language metadata tag
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c92562467e
)
2011-03-08 02:09:33 +01:00
Anssi Hannula
89e568feec
lavf: update documentation of AVOutputFormat.flags
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 14:34:32 -05:00
Anssi Hannula
c92562467e
lavf: document the use of multiple entries in language metadata tag
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 12:25:36 -05:00
Martin Storsjö
08ad81cbff
libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter
...
This removes a fixme issue, by allowing the av_pkt_dump functions
to use the correct time base.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 863c471638
)
2011-03-03 14:15:10 +01:00
Martin Storsjö
863c471638
libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter
...
This removes a fixme issue, by allowing the av_pkt_dump functions
to use the correct time base.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-02 11:29:38 +01:00
Anssi Hannula
a1c4b65b91
lavf: update documentation of AVOutputFormat.flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-24 20:00:23 +01:00
Anton Khirnov
1f5e9ede23
lavf: postpone removal of public metadata conversion API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-23 18:22:45 +01:00
Anton Khirnov
ebb92e0768
avio: rename url_fopen/fclose -> avio_open/close.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32
)
2011-02-23 18:22:03 +01:00
Anton Khirnov
22a3212e32
avio: rename url_fopen/fclose -> avio_open/close.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 10:18:55 -05:00
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
2011-02-20 19:05:47 +01:00
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
Anton Khirnov
1b98107c8d
Move find_info_tag to lavu and add av_ prefix to it
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit ab0287fcbd
)
2011-02-18 19:52:33 +01:00
Stefano Sabatini
40c3fe2c08
Deprecate parse_date() in favor of av_parse_time().
...
The new av_parse_time() is created in libavutil/parseutils.h, all the
internal functions used by parse_date are moved to
libavutil/parseutils.c and made static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f6c7375a17
)
2011-02-18 19:52:30 +01:00
Anton Khirnov
0ebf475494
lavf: add av_ prefix to dump_format()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 610219a598
)
2011-02-18 19:52:28 +01:00
Anton Khirnov
ab0287fcbd
Move find_info_tag to lavu and add av_ prefix to it
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-17 15:35:18 +01:00
Stefano Sabatini
f6c7375a17
Deprecate parse_date() in favor of av_parse_time().
...
The new av_parse_time() is created in libavutil/parseutils.h, all the
internal functions used by parse_date are moved to
libavutil/parseutils.c and made static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-16 23:39:56 +00:00
Anton Khirnov
610219a598
lavf: add av_ prefix to dump_format()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-16 23:39:56 +00:00
Reimar Döffinger
438198e795
Document that av_write_header sets stream time_base to a value of it chosing.
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 23:00:49 +01:00
Reimar Döffinger
5d820db2f9
Document that av_write_header sets stream time_base to a value of it chosing.
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-16 10:33:40 +01:00
Anssi Hannula
2ea7e1f011
lavf: add AV_DISPOSITION_CLEAN_EFFECTS flag
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 24a83bd10a
)
2011-02-15 16:32:31 +01:00
Anssi Hannula
24a83bd10a
lavf: add AV_DISPOSITION_CLEAN_EFFECTS flag
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-14 23:16:32 +00:00
Anton Khirnov
b845252d52
lavf: deprecate AVFormatContext.index_built
...
it's not touched anywhere in ffmpeg, the code setting it was removed
over two years ago (e9b78eeba2
).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b0294c80d3
)
2011-02-13 00:52:50 +01:00
Anton Khirnov
b0294c80d3
lavf: deprecate AVFormatContext.index_built
...
it's not touched anywhere in ffmpeg, the code setting it was removed
over two years ago (e9b78eeba2
).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 21:34:29 -05:00
Peter Ross
8270db386f
add AV_DISPOSITION_HEARING_IMPAIRED and AV_DISPOSITION_VISUAL_IMPAIRED
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 12c14cd4a8
)
2011-02-11 02:54:10 +01:00
Peter Ross
12c14cd4a8
add AV_DISPOSITION_HEARING_IMPAIRED and AV_DISPOSITION_VISUAL_IMPAIRED
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-10 22:55:17 +01:00
Anssi Hannula
070e5ba560
lavf: rename ff_probe_input_buffer to make it public
...
It is useful for applications that hand input data directly to lavf via
a ByteIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3940caad02
)
2011-02-09 03:33:55 +01:00
Anton Khirnov
f81946729e
lavf: move internal functions from avformat.h to internal.h
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 19711af5cd
)
2011-02-09 03:31:17 +01:00
Reimar Döffinger
2f35beae4d
Make av_set_pts_info keep previous time base if new one is invalid.
...
Fixes issue 2475.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3190529df
)
2011-02-09 03:31:17 +01:00
Anssi Hannula
3940caad02
lavf: rename ff_probe_input_buffer to make it public
...
It is useful for applications that hand input data directly to lavf via
a ByteIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-08 18:25:12 -05:00
Anton Khirnov
19711af5cd
lavf: move internal functions from avformat.h to internal.h
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 16:35:00 -05:00
Reimar Döffinger
b3190529df
Make av_set_pts_info keep previous time base if new one is invalid.
...
Fixes issue 2475.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 16:12:15 -05:00
Martin Storsjö
4ed68fdfdc
libavformat: Add a function for freeing an AVFormatContext
...
This function is useful for freeing data structures allocated by
muxers, which currently have to be freed manually by the caller.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f124b087ee
)
2011-02-06 20:31:44 +01:00
Martin Storsjö
f124b087ee
libavformat: Add a function for freeing an AVFormatContext
...
This function is useful for freeing data structures allocated by
muxers, which currently have to be freed manually by the caller.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-04 11:29:41 -05:00
Reimar Döffinger
12763671e2
Document that av_write_header sets stream time_base to a value of it chosing.
2011-01-31 19:30:49 +01:00
Anton Khirnov
d3058be6ee
lavf: move the version macros to a new header
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 50196a982b
)
2011-01-23 19:32:06 +01:00
Georgi Chorbadzhiyski
7916202b97
Add service_provider and service_name metadata
...
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.
Example usage:
ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
-metadata service_provider="Some provider" \
-metadata service_name="Some Channel" \
"udp://239.0.70.2:5000?pkt_size=1316&ttl=1"
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69688e71bc
)
2011-01-21 20:35:46 +01:00
Anton Khirnov
50196a982b
lavf: move the version macros to a new header
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 19:30:51 +00:00
Georgi Chorbadzhiyski
69688e71bc
Add service_provider and service_name metadata
...
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.
Example usage:
ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
-metadata service_provider="Some provider" \
-metadata service_name="Some Channel" \
"udp://239.0.70.2:5000?pkt_size=1316&ttl=1"
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 11:31:20 +00:00
Reimar Döffinger
54bc640362
Missing parts of IVF muxer support.
2011-01-18 08:00:23 +01:00
Ronald S. Bultje
7f88a5bf9b
Introduce av_metadata_copy() to copy metadata from one struct to another.
...
Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 19:30:55 +00:00
Anssi Hannula
cf99e4aa00
Add AVOption support for muxers.
...
Patch by Anssi Hannula, anssi d hannula a iki d fi
Originally committed as revision 26195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-02 10:52:34 +00:00
Nicolas George
9128ae08b3
Implement av_find_best_stream.
...
Originally committed as revision 26104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 09:08:20 +00:00
Anton Khirnov
107a7e3e7b
lavf: bump minor and add APIchanges entry after adding AVFMT_NOSTREAMS
...
Originally committed as revision 26103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 07:46:57 +00:00
Anton Khirnov
bb62d5c1f0
Allow output formats without any streams.
...
Required for future metadata format.
Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 07:46:44 +00:00
Peter Ross
a187c68678
Bump libavformat minor version, forgotten in r26094
...
Originally committed as revision 26095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26 05:48:38 +00:00
Michael Niedermayer
58ec7e00db
Clarify AVFMT_TS_DISCONT and muxers.
...
Originally committed as revision 26089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-25 19:49:15 +00:00
Martin Storsjö
35014efcc6
rtpdec: Add a dynamic payload handler for the x-Purevoice format, RFC 2658
...
This fixes roundup issue 2390.
Originally committed as revision 25889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-05 19:37:45 +00:00