5126a8ecbb
Fix av_find_best_stream when providing a wanted stream
...
In the main loop, stream_number is incremented after checking the stream type,
so the search usually will not find the wanted stream.
This patch eliminates the useless stream_number variable and introduces a new
one, called real_stream_index to store the real stream index of the current
stream, no matter if we are looping through all the streams or only the streams
of a program.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-11 13:05:46 +01:00
fa14610df5
Fix av_find_best_stream when decoder_ret is given and using a related stream
...
Yet another fix for the code originally designed for use without related_stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-11 13:03:43 +01:00
f8bc86d47e
avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h
...
also change its prefix to ffio
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f1ef2cd9ed
2011-03-08 02:09:34 +01:00
db44ea960d
avio: avio_ prefix for url_fsize
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69
2011-03-08 02:09:21 +01:00
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
2011-03-05 02:29:31 +01:00
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
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
2011-03-03 14:15:03 +01:00
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
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
2011-02-22 02:44:37 +01:00
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
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
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
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
33af787d8a
Fix av_find_best_stream when using a program
...
The current implementation has a bug, it is returning the stream index
in the found program, and not the stream index in the list of all
streams. The attached patch fixes this issue.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 22ec6b738f
2011-02-16 23:00:50 +01:00
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
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
e24c05cd53
Better threshold for the gcd based r_frame_rate calculation.
...
Fixes Gilmore Girls_Net 5_2011_01_08_16_10_53.wtv and RTL GP- WK Superbike - Qatar_RTL7_2009_03_14_15_49_23.wtv.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-15 04:19:31 +01:00
709946b34c
lavf: print stream disposition in dump_stream_format
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3c33c0e263
2011-02-14 23:58:19 +01:00
d43d2197c2
make av_find_best_stream() ignore streams marked with AV_DISPOSITION_*_IMPAIRED
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 5209149157
2011-02-11 02:54:10 +01:00
b38f008ea6
Frame-based multithreading framework using pthreads
...
See doc/multithreading.txt for details on use in codecs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-11 02:53:58 +01:00
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
e74c01db7e
lavf: simplify pb parameter of ff_probe_input_buffer
...
There is no need to pass the ByteIOContext via a pointer to a pointer
anymore.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit aad216fd7e
2011-02-09 03:33:55 +01:00
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
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
2d9fd1810b
add ff_index_search_timestamp and ff_add_index_entry
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e6fb5a4f78
2011-02-06 20:31:42 +01:00
d20d1449e0
Make ff_interleave_compare_dts static to utils.c.
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 101e1f6ff9
2011-01-26 03:43:31 +01:00
440d761e40
Clarify timestamps related error messages in compute_pkt_fields2().
...
Originally committed as revision 26308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 12:17:27 +00:00
6cbce63650
Fix assertion fail on audio files with invalid sample rates,
...
fixes issue 2475.
Patch by Daniel Kang, daniel.d.kang at gmail
Originally committed as revision 26240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 03:30:19 +00:00
6bbdba08c2
Revert previous commit, as it was not meant to be pushed.
...
Originally committed as revision 26239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 01:11:57 +00:00
7820147e6f
Issue more explicit error messages in compute_pkt_fields2().
...
Originally committed as revision 26238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 01:01:21 +00:00
81bd411965
In av_close_input_stream(), flush the packet queue before to actually
...
close the stream.
This way the flushed packets can still reference the still unclosed
format context.
In particular this fixes a spurious error issued when closing the
video4linux2 buffer in mmap_release_buffer(), which tries to access
the file descriptor of an already closed file.
Originally committed as revision 26237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-06 01:01:14 +00:00
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
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
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
141de5a9c1
add ff_find_stream_index
...
Originally committed as revision 26092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26 01:24:51 +00:00
9100d4d632
Fix crash if invalid bit-rate was read from file.
...
Fixes issue 2426.
Patch by David Czech, davidczech510 gmail
Originally committed as revision 26061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-20 09:58:27 +00:00
118ccae030
add subtitle codec autodetection
...
Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 14:46:13 +00:00
581ba2cee1
In av_find_stream_info, decode more h264 to get correct delay, issue #2020
...
Originally committed as revision 25824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 02:19:03 +00:00
6bfc268305
Add av_append_packet function, to be used in code that merges packets
...
to allow palette handling without using PaletteControl.
Originally committed as revision 25777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 10:24:48 +00:00
b3c0fc7673
av_find_stream_info(): set subtitle codec time_base
...
Originally committed as revision 25758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-16 23:50:18 +00:00
cb2c971d91
allow passing subtitles header between decoder and encoder
...
Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-13 13:57:49 +00:00
273231466c
lavf/utils: use av_{i/o}format_next() instead of first_{i/o}format
...
Originally committed as revision 25738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-13 08:55:15 +00:00
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
d60a9f52eb
lavf: simplify setting the encoder ident tag.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 13:07:20 +00:00
13728334e8
add FF_API_SYMVER define to disable symver compatibility functions
...
Originally committed as revision 25491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 18:25:01 +00:00
114c9a5925
add FF_API_FIRST_FORMAT define to drop deprecated first_?format from public api
...
Originally committed as revision 25489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 14:25:36 +00:00
d87a521cde
add FF_API_PARSE_FRAME_PARAM define to disable the deprecated
...
parse_image_size() and parse_frame_rate() public functions
Originally committed as revision 25485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 13:33:23 +00:00
88e44314ea
add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() function
...
Originally committed as revision 25482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 12:54:12 +00:00
198ac67fe8
add FF_API_GUESS_FORMAT define to disable the deprecated guess_format()
...
and guess_stream_format() public functions
Originally committed as revision 25480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 12:45:14 +00:00
fd0368e7ca
move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation
...
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 22:01:19 +00:00
Marton Balint
Anton Khirnov
Martin Storsjö
Stefano Sabatini
Reinhard Tartler
Anssi Hannula
Michael Niedermayer
Peter Ross
Alexander Strange
Reimar Döffinger
Diego Elio Pettenò
Daniel Kang
Nicolas George
Anton Khirnov
David Czech
Aurelien Jacobs
Baptiste Coudurier