generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,841 Commits 24 Branches 241 Tags 173 MiB
e82cbb69a7
Commit Graph

756 Commits

Author SHA1 Message Date
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
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
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
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
David Czech
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
Aurelien Jacobs
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
Baptiste Coudurier
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
Reimar Döffinger
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Anton Khirnov
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
Stefano Sabatini
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
Anton Khirnov
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
e99179de9b remove useless local variable 
Originally committed as revision 25394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:10:51 +00:00
Aurelien Jacobs
3e4318bf4a remove useless local allocated start_time array 
Originally committed as revision 25393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:05:31 +00:00
Aurelien Jacobs
61138c43e0 properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR 
Originally committed as revision 25382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 21:43:46 +00:00
Aurelien Jacobs
38aab35f47 add new streams API without MAX_STREAMS limit 
(disabled until next major bump)

Originally committed as revision 25381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:56:14 +00:00
Aurelien Jacobs
feb2440c38 dynamically use nb_streams instead of static use of MAX_STREAMS 
Originally committed as revision 25380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:52:26 +00:00
Reimar Döffinger
6612d8cf31 Move handling of ID3v2 to common utils.c code, reducing code duplication 
and supporting it for more formats, fixing issue 2258.

Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:21:07 +00:00
Martin Storsjö
eb99f179fa find_info_tag: Make sure the output buffer is null terminated 
Originally committed as revision 25353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:33:56 +00:00
Benjamin Larsson
62784e3733 Add the CODEC_CAP_CHANNEL_CONF capability code and add 
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 22:18:02 +00:00
Michael Chinen
59cb40b921 Fix index_entries pos: 
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 22:17:58 +00:00
Michael Niedermayer
6ed040408b Move AVOptions from libavcodec to libavutil 
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 14:25:22 +00:00
Christian d'Heureuse
b163078fe3 Fix formatting for negative start times (issue 2139). 
Patch by Christian d'Heureuse, chdh inventec ch

Originally committed as revision 25063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 21:06:21 +00:00
Aurelien Jacobs
b004207df4 move stream info arrays into a struct to ease future dynamic allocation 
Originally committed as revision 25045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-05 22:25:45 +00:00
Måns Rullgård
668338c573 avformat: free decryption key in av_close_input_stream() 
Originally committed as revision 24899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:08:53 +00:00
Martin Storsjö
f9c399c4fd Make parse_key_value from httpauth a common lavf internal function 
Originally committed as revision 24832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:49:53 +00:00
Aurelien Jacobs
54036be11a rename LAVF_API_* defines to FF_API_* to clarify that it is not public API 
Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 20:34:31 +00:00
Aurelien Jacobs
dd872bf49f add LAVF_API_OLD_METADATA define to disable the deprecated metadata API 
Originally committed as revision 24818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 20:23:19 +00:00
Baptiste Coudurier
d2064fd42b Fix segv when stream copy and validate_tag fails, st->codec->codec is not set 
Originally committed as revision 24782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 00:35:19 +00:00
Przemysław Sobala
ec973f45a3 Fix mem leak when trying to open a non-existing image file (issue 2126). 
Patch by Przemysław Sobala, psobala wp-sa pl

Originally committed as revision 24757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-10 17:27:22 +00:00
Martin Storsjö
311baee795 Make hex_to_data a lavf internal function 
This is useful for other future RTP depacketizers

Originally committed as revision 24747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 10:05:33 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate() 
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 23:12:28 +00:00
Baptiste Coudurier
9d3fdf2031 Move AVStream->codec_info_nb_frames increment after try_decode_frame 
Originally committed as revision 24017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 03:15:37 +00:00
Baptiste Coudurier
ae447836af In av_find_stream_info, decode at least 4 h.264 frames to be able to guess delay. 
Originally committed as revision 24014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 03:07:33 +00:00
XBMC
b0a18c2f0a Make "invalid dts/pts combination" a debug instead of a warning message. 
Patch by XBMC

Originally committed as revision 23919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 23:01:44 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Eli Friedman
22d78b05b1 Fix an "assignment from incompatible pointer type" warning in av_read_frame_internal 
Patch by Eli Friedman, eli dot friedman at gmail

Originally committed as revision 23842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 08:04:52 +00:00
Måns Rullgård
f3bfe388b5 Make ff_url_split() public 
ff_url_split() is retained as an alias, as it was used by ffserver,
to avoid breaking ABI compatibility with it.

Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-27 14:16:46 +00:00
Stephen Dredge
5be5d28ced Fix failure in av_read_frame on timestamp rollover. 
Patch by Stephen Dredge, sdredge A tpg com au

Originally committed as revision 23699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 08:48:28 +00:00
Martin Storsjö
a955fc5ee7 ff_url_join: Don't add any at-char if the auth is an empty string 
Originally committed as revision 23650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-19 21:56:50 +00:00
Måns Rullgård
b462d13262 Add compatibility wrappers for functions moved from lavf to lavc 
When symbol versioning is enabled, moving symbols from one library to
another breaks binary compatibility.  This adds wrappers with the old
version tag for the av_*packet functions recently moved to lavc.

Originally committed as revision 23611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-15 13:26:52 +00:00
Michael Niedermayer
7686ab07ac Fix muxing rgb rawvideo in avi regression. 
Originally committed as revision 23500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-05 23:13:52 +00:00
Stefano Sabatini
b603ab8dc1 Make the error message issued in case of invalid codec tag more 
informative.

Originally committed as revision 23423 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 10:54:53 +00:00
Michael Niedermayer
b742a12ee2 Print an error when MAX_STREAMS is reached. 
Originally committed as revision 23413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-01 19:49:21 +00:00
Michael Niedermayer
a5266a4789 Make sure that when the parser is feeded with frame==packet that the 
packets are passed through and wont be marked as static which would
require them to be copied by av_dup_packet().

Originally committed as revision 23352 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-27 17:11:37 +00:00
Alex Converse
74a6df59e3 Add an AVSTREAM_PARSE_FULL_ONCE parsing mode to parse headers and combine packets once and only once. 
Originally committed as revision 23332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-26 04:20:32 +00:00
Jai Menon
9bbe9a0dc1 Display a more descriptive log message when probe buffer limit is 
reached.

Originally committed as revision 23288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 16:42:16 +00:00
Stefano Sabatini
e1745e2f6e Make av_write_header() return AVERROR(EINVAL) rather than -1 if the 
input parameters are not valid.

Originally committed as revision 23253 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 21:52:06 +00:00
Stefano Sabatini
cf5b33d9fa Store in a dedicated array the format name - codec id - codec type 
mapping. Simplify.

Originally committed as revision 23252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 21:52:02 +00:00
Stefano Sabatini
83c2707908 Prefer enum CodecID over int in ff_codec_get_tag(). 
Originally committed as revision 23249 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 15:56:49 +00:00
Martin Storsjö
9a76125069 Add a libavformat internal function ff_write_chained 
Originally committed as revision 23207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-21 07:07:57 +00:00
Francesco Lavra
698f4cc7f0 Validate AVCodecTag vs CodecID. 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:23:29 +00:00
Francesco Lavra
603a5f04b2 Factorize some code into the new function ff_toupper4(). 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 19:16:40 +00:00
Baptiste Coudurier
58edb075f0 Change MAX_READ_SIZE message during av_find_stream_info to DEBUG level. 
It is not harmful and it scares too many users.

Originally committed as revision 23139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 22:04:39 +00:00
Reimar Döffinger
8e2ee182fa Export av_probe_input_format2. 
Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 13:49:35 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Jean-Daniel Dupas
2898526d6a Do not probe when the format is known. 
Patch by Jean-Daniel Dupas devlists shadowlab org

Originally committed as revision 22870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-13 07:25:50 +00:00
Michael Niedermayer
0f1f4816d5 Raise needed score for codec probing in CODEC_ID_PROBE before the last packet. 
Fixes issue1871

Originally committed as revision 22831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-11 00:43:36 +00:00
Michael Niedermayer
497431a5b6 Dont try to compute AVPacket duration for possibly interlaced video codecs 
when no parser is available.
This partly fixes the frame rate misdetection in issue1756.

Originally committed as revision 22824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-09 22:39:39 +00:00
Tomas Härdin
01d91b9be9 Reusing the probe buffer to rewind the ByteIOContext in ff_probe_input_buffer() instead of seeking back to the start of the file. Once exhausted, the size of the buffer is reduced. 
Originally committed as revision 22821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 09:02:27 +00:00
Michael Niedermayer
0e1f78f90b Fix rounding direction for calculation of AVPacket.duration. 
Fixes issue1579

Originally committed as revision 22802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 22:19:42 +00:00
Michael Niedermayer
ccf8c2944c Limit probing to probesize. 
Originally committed as revision 22758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 12:09:33 +00:00
Michael Niedermayer
fe8344a276 Add AVFMT_FLAG_NOFILLIN and AVFMT_FLAG_NOPARSE. 
Originally committed as revision 22745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:55:16 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Joakim Plate
46da7fa133 Probe aac codecs for CODEC_ID_PROBE. 
Patch by Joakim Plate, elupus ecce se

Originally committed as revision 22742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 10:45:15 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Micah F. Galizia
532aa889eb Fix updating condition for the probe_size variable in the internal 
loop of ff_probe_input_buffer(), making sure that probe_size is always
set to probe_max_size in the last iteration.

Also make the function return an error if we get to the max probe
length and still cannot figure out what the format is.

Patch by Micah Galizia micahgalizia A gmail D com.

Originally committed as revision 22688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-26 01:12:14 +00:00
Martin Storsjö
d8f9295753 Reindent 
Originally committed as revision 22666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 07:14:41 +00:00
Martin Storsjö
ddbeb95447 Add a lowercase parameter to ff_data_to_hex 
Originally committed as revision 22665 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 07:13:20 +00:00
Stefano Sabatini
2928b83c75 Make av_open_input_file() return AVERROR_INVALIDDATA rather than 
AVERROR_NOFMT if the format is unknown / cannot be recognized.

It is returned AVERROR_INVALIDDATA, in the sense that the data is
invalid within what the specific libav* binary supports.

That was the last remaining use of AVERROR_NOFMT, which is going to be
dropped at the next libavutil major bump.

Originally committed as revision 22625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 16:34:04 +00:00
Måns Rullgård
c7f625eecf Fix erroneous behaviour when format probe hits end of file 
If the format probe hits end of file, do not add the error code
to the buffer position.  This is obviously wrong, and with a
small input file would cause a negative buffer overflow.

Fixes issue 1818.

Originally committed as revision 22571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-16 21:45:30 +00:00
Aurelien Jacobs
972ffe6220 rename av_read_frame_flush to ff_read_frame_flush 
it is an internal function, not part of public API

Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:15:24 +00:00
Aurelien Jacobs
588af13fee rename av_program_add_stream_index to ff_program_add_stream_index 
it is an internal function, not part of public API

Originally committed as revision 22561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:14:07 +00:00
Martin Storsjö
2dad0dcec6 Move the NTP offset definitions to internal.h 
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 10:36:30 +00:00
Micah F. Galizia
eadd495d06 Move the probe loop from av_open_input_file() into its own method 
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

New attempt after r22296, which was revert in r22315 due to a FATE
failure.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Move av_open_input_file probe loop to its own method
Date: 2010-03-05 03:23:57 GMT

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 22:40:16 +00:00
Martin Storsjö
594a9aebbe Make the ntp_time function available to other parts of libavformat, as ff_ntp_time 
Originally committed as revision 22438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 22:21:39 +00:00
Michael Niedermayer
67c10de7d2 Add special case to avoid binary search when appending index entries. 
Originally committed as revision 22400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 15:19:23 +00:00
Stefano Sabatini
f4495cdc00 Remove definition of match_ext(), which is declared under #ifdef 
HAVE_AV_CONFIG_H and so not publicly declared, and currently unused.

Originally committed as revision 22353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 23:51:53 +00:00
Martin Storsjö
f984dcf6dd Reindent 
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 09:05:03 +00:00
Martin Storsjö
c5c6e67c28 Rename url_split to ff_url_split 
Since this function isn't in the public API, it should have an ff_ prefix.

Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 09:03:25 +00:00
Måns Rullgård
f19341e17a Revert "Move the probe loop from av_open_input_file() into its own method" 
This reverts r22296.  This change made some files to fail to open.
The patch submitter has promised to investigate next week.

Originally committed as revision 22315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 03:46:37 +00:00
Alex Converse
e7e291e960 av_find_stream_info(): Add a workaround for backwards compatible HE-AAC signaling. 
The sample rate, frame size, and channel count from the container are
not reliable when backwards compatible signaling is used.

Originally committed as revision 22301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 00:00:50 +00:00
Daniel Kristjansson
663322c1b8 Fix pts->dts conversion init for non-zero initial value for pts. 
Patch by Daniel Kristjansson, danielk cuymedia net

Originally committed as revision 22297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 23:10:18 +00:00
Micah F. Galizia
4245c6ec4e Move the probe loop from av_open_input_file() into its own method 
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 22:42:11 +00:00
Måns Rullgård
c26e58e32c Add some missing #includes 
Originally committed as revision 22258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:36 +00:00
Martin Storsjö
780d7897a9 Add a function ff_url_join for assembling URLs 
Originally committed as revision 22225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 22:31:45 +00:00
Vitor Sessak
5301a05d3e Fix memory leak in NUT muxer 
Originally committed as revision 22222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 17:26:34 +00:00
Anton Khirnov
82f50f820e Print chapter info in dump_format(). 
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 18:37:09 +00:00
Michael Niedermayer
ab392695d5 Count all frames with codec_info_nb_frames not just ones with non zero 
duration. I hope this breaks nothing. Its needed for my fix of issue1156

Originally committed as revision 22001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:29:57 +00:00
Michael Niedermayer
6c6e6ef5e2 Put codec_info_nb_frames back in AVStream and print its value. 
This way streams with no or very few frames can be avoided during
auto selection

Originally committed as revision 21998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 15:07:18 +00:00
Michael Niedermayer
b7884740fa Make sure mp1/mp2 get their frame_size set. 
Fixes issue1696

Originally committed as revision 21972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 22:05:20 +00:00
Michael Niedermayer
0e5f33f242 Make sure a set r_frame_rate is not overriden by a guess. 
Also make sure we dont waste time in this case with collecting timestamps.

Originally committed as revision 21957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 10:19:46 +00:00
Anton Khirnov
ed7694d8cf Set lavf identification string globally in av_write_header(), rather 
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 16:32:25 +00:00
Michael Niedermayer
ab5a0175f5 Add flag so muxers not needing width/height can signal this. 
Add this flag to img2 (fixes -vcodec copy to image2 in some cases)

Originally committed as revision 21773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 20:35:29 +00:00
Michael Niedermayer
e6406939a8 Directly use av_rescale_rnd() instead of av_convert_ts() as this cuts the 
number of calls to it down by 2.

Originally committed as revision 21676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 19:10:04 +00:00
Michael Niedermayer
e5026c36d4 Use av_compare_ts() for interleaving per dts. 
Originally committed as revision 21672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 16:27:17 +00:00
Michael Niedermayer
8c3b161e9e Dont try generic seek if seek request before first index entry and backward. 
Fixes issue1275

Originally committed as revision 21633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 23:59:48 +00:00
Michael Niedermayer
43e4d57f66 Try to open decoders in av_find_stream_info() even if no packets for the 
stream are found.
Fixes issue1385

Originally committed as revision 21630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 23:05:58 +00:00
Michael Niedermayer
411ff3225f Increase search range if no end timestamp could be found for the duration 
calculation.

Originally committed as revision 21577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-31 17:43:18 +00:00
Michael Niedermayer
c55806e3a2 Flag to ignore dts on frames that contain pts. 
This works around common issues with mpeg-ps files with broken timestamps.
Also allows playing the broken sample from issue1024.

Originally committed as revision 21562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-30 22:55:12 +00:00
Michael Niedermayer
d30a8beb99 Fix duration calculation in the presence of a single wraping of the timeline. 
Fixes issue1714.

Originally committed as revision 21485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 19:37:52 +00:00
Baptiste Coudurier
c3aeaa540d set average frame rate in mov demuxer 
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:56:04 +00:00
Tomas Härdin
094a63f1f6 Check there is a stream before writing header. 
Patch by Tomas Härdin: $(name) punto hardin chez codemill dot se

Originally committed as revision 21186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 14:32:48 +00:00
Stefano Sabatini
4160069067 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and 
XXX_license() functions, consistent with the rest of FFmpeg.

Originally committed as revision 21005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-03 14:31:25 +00:00
Stefano Sabatini
aa13b573b4 Use av_match_ext() in place of the deprecated match_ext() function. 
Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 23:56:09 +00:00
Stefano Sabatini
8eb631fa50 Deprecate match_ext() in favor of av_match_ext(), and mark it for 
deletion at the next major bump.

Originally committed as revision 20998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 23:50:10 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format(). 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:58:03 +00:00
Stefano Sabatini
a1f547b94a Deprecate guess_format() in favor of av_guess_format(). 
Originally committed as revision 20991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:46:24 +00:00
Stefano Sabatini
1642ee4337 Deprecate and mark for deletion the function guess_stream_format(), 
and clone its code to ffserver_guess_format() in ffserver.c.

guess_stream_format() is hackish since it relies on some undocumented
properties of the name of the muxers (wich is currently only relevant
for the ASF muxer), and has no use outside ffserver.c.

Originally committed as revision 20987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-31 14:12:58 +00:00
Michael Niedermayer
02483df478 Make sure the Metadata: header is not printed if the only metadata will not 
be displayed. (idea from ffmbc)

Originally committed as revision 20850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:39:20 +00:00
Michael Niedermayer
b298daea1a Move dump_metadata() to where it is in ffmbc, looks better. 
Originally committed as revision 20849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:34:46 +00:00
Michael Niedermayer
229303d16c indent 
Originally committed as revision 20848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:31:01 +00:00
Michael Niedermayer
4d9b678448 Skip dumping language twice. 
This looks too ugly. Idea also from ffmbc.

Originally committed as revision 20847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:30:41 +00:00
Michael Niedermayer
2e720e11bc dump metadata for AVStreams & AVPrograms too. 
Originally committed as revision 20846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:27:43 +00:00
Michael Niedermayer
8b5e5ec5d7 Factorize dump_metadata() out. 
Idea from ffmbc, code not, mine is a fraction of the size due to simpler
metadata API.

Originally committed as revision 20845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 23:19:24 +00:00
Michael Niedermayer
cc20679a41 Try to simplify av_estimate_timings_from_pts() like in ffmbc. 
Note if this breaks for some file, report it please!

Originally committed as revision 20844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 22:56:59 +00:00
Michael Niedermayer
0e500e0db2 Debug av_log() about stream probing from ffmbc. 
Originally committed as revision 20842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 22:15:51 +00:00
Michael Niedermayer
02b398ef49 Add avg_frame_rate. 
Originally committed as revision 20826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 15:52:11 +00:00
Michael Niedermayer
51ce8c2f87 Remove commented out code. 
Originally committed as revision 20823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 15:01:09 +00:00
John Stebbins
106fa129f4 Reset pts_buffers in av_read_frame_flush(). 
Patch by John Stebbins, jstebbins jetheaddev com

Originally committed as revision 20806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 15:26:33 +00:00
Sean Soria
b593f7fdef Calls to url_fseek should have their return value checked in 
av_seek_frame_binary, just as they do in av_seek_frame_generic.
Otherwise, function may return success even though url_fseek reported
failure.

Patch by Sean Soria, first.last at gmail

Originally committed as revision 20744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-06 00:03:53 +00:00
Sean Soria
6659b32ab2 Change ret type to int64_t because url_fseek returns int64_t. 
This fixes seeking in files > 2gb.
Patch by Sean Soria, sean dot soria at gmail dot com.

Originally committed as revision 20693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 22:56:44 +00:00
Baptiste Coudurier
66765b5933 use AVFormatContext in av_log, better than AVCodecContext when multiple streams are present 
Originally committed as revision 20689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 20:15:05 +00:00
Michael Niedermayer
77ac76a30f Print a warning if the duration is estimated from the bitrate, as this is 
likely not accurate.

Originally committed as revision 20675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 22:08:22 +00:00
Diego Biurrun
c173693698 Add functions to return library license and library configuration. 
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-18 17:15:17 +00:00
Diego Biurrun
ca02d8ec97 Add '#undef fprintf' before PRINT macro that uses fprintf. 
Otherwise there may be trouble when fprintf is disabled in favor of av_log.

Originally committed as revision 20515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-11 21:57:50 +00:00
Baptiste Coudurier
050ba6f45e print packet duration when debugging timestamps 
Originally committed as revision 20420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-30 18:17:16 +00:00
Baptiste Coudurier
72017ea1dc check stream index validity in av_program_add_stream_index 
Originally committed as revision 20319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:55:27 +00:00
Baptiste Coudurier
8425cecacc request mp3 frame_size to be set in has_codec_parameters, fix issue #1314 
Originally committed as revision 20318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:53:32 +00:00
Baptiste Coudurier
f2c061ec0f reindent after commit 
Originally committed as revision 20307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 02:20:08 +00:00
Baptiste Coudurier
7edbcfb79e In dump_format, print streams not associated with any program. 
Fixes issue #1366.

Originally committed as revision 20306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 02:12:10 +00:00
Baptiste Coudurier
7857d3ccf6 fix indentation and add braces 
Originally committed as revision 20289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:25:48 +00:00
Vitor Sessak
a4cb675124 Avoid segfault for empty input files 
Originally committed as revision 20265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 20:37:58 +00:00
Carl Eugen Hoyos
b8c0db9981 Allow autodetection of E-AC3. 
Originally committed as revision 20206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-11 11:56:53 +00:00
Carl Eugen Hoyos
e18027ac40 Add FIXME about low_delay vs has_b_frames. 
Originally committed as revision 20161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 19:40:52 +00:00
Wallak
f4a4be3f4e H264 allows B frames without requiring a >=1 sized buffer. 
Patch by wallak, wallak free fr

Originally committed as revision 20160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 19:30:09 +00:00
Michael Niedermayer
e9b0681610 Only use *ic_ptr when it has been initialized. 
Originally committed as revision 19911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 13:19:13 +00:00
Baptiste Coudurier
db46c4e14d print at debug level the score at which codec probing succedeed 
Originally committed as revision 19899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:46:50 +00:00
Michael Niedermayer
1bc8c36125 Print a warning if a format has been detected with a low score. 
Originally committed as revision 19890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 20:44:26 +00:00