ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-29 01:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,578 Commits 37 Branches 398 Tags 500 MiB
4cc843facd
Commit Graph

7452 Commits

Author SHA1 Message Date
Alex Converse
7f01a4192c adts: Fix PCE copying. 
Parse the extension flag bit when reading the MPEG4 AudioSpecificConfig.

This has nothing to do with SBR/PS contradictory to what was noted when it was removed.
 2011-07-06 22:38:59 -07:00
Anton Khirnov
5e8d2e337e lavf: deprecate AVStream.quality. 
AVStream is no place for it and it's unused outside of ffmpeg anyway.
 2011-07-06 20:10:41 +02:00
Kostya
df64da3b1e bink: pass Bink version to audio decoder through extradata instead of codec_tag. 
This is needed because not all players (e.g. MPlayer) are able to distinguish
two different Bink audio decoders when codec_tag is set.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-06 14:52:02 +02:00
Diego Biurrun
d3f751e603 Add some missing mathematics.h #includes for av_rescale(). 2011-07-05 20:16:38 +02:00
Clément Bœsch
4d5e7ab5c4 mxfenc: fix ignored drop flag in binary timecode representation. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-05 08:04:44 -07:00
Nicolas George
9cec1bbd14 ogg: propagate return values and return more meaningful error values 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-04 15:59:58 +02:00
Reimar Döffinger
0a94020b5b oggdec: Abort Ogg header parsing when encountering a data packet. 
Fixes Bugzilla #11.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-04 12:54:27 +02:00
Clément Bœsch
19b6127365 mxfenc: small typo fix 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-04 12:54:26 +02:00
Mans Rullgard
abc78a5a7c Do not include log.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:07 +01:00
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Mans Rullgard
ee8aecd23a Do not include intfloat_readwrite.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Mans Rullgard
add41decd9 Remove return statements following infinite loops without break 
These statements cannot be reached and are thus not needed.
This removes a number of compiler warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:39:07 +01:00
Diego Biurrun
f75e3da535 RTSP: Doxygen comment cleanup 
Do not use Doxygen for comments that apply to specific implementation
details; merge some duplicated Doxygen comment blocks.
 2011-07-03 22:33:22 +02:00
Diego Biurrun
c81a2b9b4f doxygen: Escape '\' in Doxygen documentation. 2011-07-03 21:44:04 +02:00
Diego Biurrun
24c9babaaf doxygen: Fix parameter names to match the function prototypes. 2011-07-03 18:30:02 +02:00
Diego Biurrun
91c9aa0941 Move some conditionally used code below the appropriate #ifdef. 2011-07-03 18:30:01 +02:00
Mans Rullgard
c9403419b2 avidec: simplify convoluted flow in avi_load_index() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 03:16:00 +01:00
Mans Rullgard
b27565b143 Remove statements immediately following unconditional jumps 
This removes a number of compiler warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 03:15:53 +01:00
Reinhard Tartler
12489443de libavformat: Add an example how to use the metadata API 
Also include it into the doxygen documentation
 2011-07-02 13:52:29 +02:00
Reinhard Tartler
21a19b7912 doxygen: Prefer member groups over grouping into modules 
Before this, almost all module groups have been used for grouping functions
and fields in structures semantically. This causes them to not appear
properly in the file documentation and needlessly clutters up the "Modules"
index.

Additionally, this commit streamlines some spelling and appearances.
 2011-07-02 13:52:29 +02:00
Reinhard Tartler
1a53a438dc avformat: doxify the Metadata API 
convert the comment that documents the metadata API to use
the doxygen markup
 2011-07-02 10:16:53 +02:00
Anton Khirnov
4f731c4429 lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format. 
av_open_input_stream used to allow this, even though it makes no sense.
Make it just print a warning instead of failing, thus restoring
compatibility.

Note that avformat_open_input() will still reject this combination.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-02 08:41:57 +02:00
Anton Khirnov
5001d6ef4a lavf: use the correct pointer in av_open_input_stream(). 2011-07-02 08:41:57 +02:00
Alex Converse
d3f610c186 avidec: infer absolute vs relative index from first packet 2011-07-01 16:08:21 -07:00
Alex Converse
8b84af7488 avidec: Factor out the sync fucntionality. 2011-07-01 10:27:06 -07:00
John Stebbins
cdc2c1c576 matroskadec: matroska_read_seek after after EBML_STOP leads to failure. 
EBML_STOP leaves matroska->current_id set. Then matroska_read_seek changes
the stream position without resetting current_id.  The next
matroska_parse_cluster  fails due to calculation of incorrect pos.  So clear
current_id when avio_seek happens in matroska_read_seek.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-07-01 08:59:26 -07:00
Reinhard Tartler
d7537a6fce doxygen: Include libavcodec and libavformat examples into the documentation 2011-06-30 21:19:16 +02:00
Benjamin Larsson
dafaef2fe1 Add support for aac streams in mp4/mov without extradata. 2011-06-30 10:10:26 -07:00
Martin Storsjö
5d62d0b114 udp: Fix a compilation warning 
This fixes this compilation warning, by making endptr a non-const
pointer, as required by strtol:
In function ‘udp_open’:
warning: passing argument 2 of ‘strtol’ from incompatible pointer type

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-30 12:04:46 +03:00
Ami Fischman
5dd514af93 matroskadec: forward parsing errors to caller. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-29 15:27:55 -07:00
Ami Fischman
59ca3955fb av_find_stream_info: simplify EAGAIN handling. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-29 15:27:55 -07:00
Ronald S. Bultje
9ed6cbc3ee ogg: fix double free when finding length of small chained oggs. 
ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.
 2011-06-29 09:45:52 -07:00
Mans Rullgard
57b4a3dd2b build: include sub-makefiles using full path instead of symlinks 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-28 18:15:19 +01:00
Kostya Shishkov
cb7b55b096 wavpack: skip blocks with no samples 
These blocks don't report audio stream parameters and they are not needed
for decoding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-28 16:41:26 +01:00
Diego Biurrun
a6213f3dce build: Remove redundant config.mak includes from subdirectory Makefiles. 
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
 2011-06-25 13:02:51 +02:00
Can Wu
fc66e23154 udp: Receive on the remote port number, if no local port is set 
For a unicast udp stream to localhost:1234, currently
ffplay udp://:1234?localport=1234
works, but
ffplay udp://:1234
doesn't work.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-24 18:27:02 +03:00
Diego Biurrun
adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-24 00:37:49 +02:00
Martin Storsjö
9abbe8cc13 Use av_printf_format to check the usage of printf style functions 
This helps catching cases where the format string doesn't
match what is passed in, or injection bugs where user data
is passed in as format string.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-23 20:17:46 +03:00
Diego Biurrun
35fa0d4758 nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). 
This eliminates a warning about a set-but-unused variable.
 2011-06-23 13:47:16 +02:00
Carl Eugen Hoyos
53d5cd2c82 mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. 2011-06-21 21:39:00 +02:00
ami_stuff
7ac639654f mov: Support R10g codec identifier. 2011-06-21 21:38:59 +02:00
Kamil Nowosad
a304a83362 riff/img2: Add JPEG 2000 codec IDs. 2011-06-21 21:38:59 +02:00
ami_stuff
2ea1ca1714 riff: Add DAVC fourcc. 
This fourcc is used by the "mpegable AVC" codec and files encoded with
this codec decode correctly with our H.264 decoder.
 2011-06-21 21:38:58 +02:00
Carl Eugen Hoyos
682a20114e riff: Add M263, XVIX, MMJP, CDV5 fourccs. 2011-06-21 21:38:53 +02:00
ami_stuff
d352df0931 rawvideo: Support auv2 fourcc. 2011-06-21 21:33:58 +02:00
Justin Ruggles
e6c52cee54 Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). 
av_get_bits_per_sample_fmt() is deprecated.
 2011-06-20 18:56:06 -04:00
Yusuke Nakamura
ae88e9cf99 mov: Fix empty edit detection. 2011-06-19 18:15:56 -07:00
Ronald S. Bultje
dbafb0e06f lavf: prevent crash in av_open_input_file() if ap == NULL. 
Needed for proper behaviour in our old API compatibility code.
 2011-06-18 17:51:10 -04:00
Anton Khirnov
84bd2b4bf5 lavf: add a forgotten NULL check in convert_format_parameters(). 2011-06-18 17:42:44 +02:00
Anton Khirnov
7c44d716e7 Add minor bumps and APIChanges entries for lavf private options. 2011-06-16 20:24:58 +02:00
Anton Khirnov
25de5958c8 lavf: add avformat_write_header() as a replacement for av_write_header(). 
It supports more convenient setting of AVOptions.
 2011-06-16 20:24:56 +02:00
Anton Khirnov
603b8bc2a1 Deprecate av_open_input_* and remove their uses. 
Deprecate the last remaining member of AVFormatParameters.
 2011-06-16 20:24:56 +02:00
Anton Khirnov
05e84c95c7 lavf: add avformat_open_input() as a replacement for av_open_input_* 
Add support for demuxer private options.
 2011-06-16 20:24:56 +02:00
Diego Biurrun
1d076f46a0 rtpenc_latm: Consistently use "Libav" in license boilerplate. 2011-06-16 17:13:34 +02:00
Martin Storsjö
d840733937 rtsp: Don't pass string pointer as format string to ff_url_join 
In this case, the string that was passed couldn't contain
user-defined data and thus there was no risk for injection
bugs, but it's safer this way, if we later change the
content of the options string.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-16 17:40:28 +03:00
Kirill Zorin
6095388812 mmsh: fixed printf injection bug in mmsh request 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-16 17:40:21 +03:00
Diego Biurrun
35bdaf3d42 utils: Drop pointless '#if 1' preprocessor directive. 2011-06-13 23:02:28 +02:00
Carl Eugen Hoyos
8d0786ec6d wav: remove an invalid free(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:47:06 +02:00
Michael Niedermayer
a8fd2f4e02 lavf: initialise reference_dts in av_estimate_timings_from_pts. 
Fixes issue2437.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:46:06 +02:00
Peter Ross
a31d4b3a99 img2: add .dpx to the list of supported file extensions. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:43:29 +02:00
Diego Biurrun
919d7a345a Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. 2011-06-10 19:12:14 +02:00
Kieran Kunhya
f74e5b76b1 adts: Adjust frame size mask to follow the specification. 
This fixes ADTS detection for at least one sample.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-10 18:41:04 +02:00
Martin Storsjö
d16cccac98 movenc: Add RTP muxer/hinter options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:32 +03:00
Martin Storsjö
f3f82296a4 movenc: Pass the RTP AVFormatContext to the SDP generation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:25 +03:00
Martin Storsjö
e2e29c6247 rtspenc: Add RTP muxer options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:52:22 +03:00
Martin Storsjö
6cf09bb7ef rtspenc: Add an AVClass for setting muxer specific options 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:41 +03:00
Martin Storsjö
ff0824f72c rtpenc_chain: Pass the rtpflags options through to the chained muxer 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:23 +03:00
Martin Storsjö
635fac9af1 rtpenc: Declare the rtp flags private AVOptions in rtpenc.h 
This allows other muxers that chain a RTP muxer to declare
the same options easily.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:08 +03:00
Martin Storsjö
9c434ce826 sdp: Reindent after the previous commit 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:49:55 +03:00
Juan Carlos Rodriguez
0832122880 rtpenc: MP4A-LATM payload support 
This is enabled with an AVOption on the RTP muxer. The SDP
generator looks for a latm flag in the rtpflags field.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:49:20 +03:00
Martin Storsjö
0558e266a2 sdp: Allow passing an AVFormatContext to the SDP generation 
Options from the AVFormatContext can be read for modifying
the generated SDP.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:45:22 +03:00
Yusuke Nakamura
f33a6a22b4 mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-10 09:06:02 +02:00
Stefano Sabatini
996bbdbf1f lavf: make compute_pkt_fields2() return meaningful error values 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-09 23:00:11 +02:00
Reimar Döffinger
4654420410 matroskadec: set timestamps for RealAudio packets. 
Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-09 22:53:17 +02:00
Alex Converse
85e9e3a9fa movdec: Add support for the 'wfex' atom. 
The 'wfex' is just a Microsoft WaveFormatEx struct.
 2011-06-09 10:14:32 -07:00
Alex Converse
ed8a50068c riff: Fix potential memleak. 
Make ff_get_wav_header() free existing extradata before allocing a new
buffer.
 2011-06-09 10:12:50 -07:00
Etienne Buira
a71bcd1a7f crypto: Use av_freep instead of av_free 
This fixes a potential double free.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-08 23:41:53 +03:00
Anton Khirnov
dbaba52ed2 lavf: don't try to free private options if priv_data is NULL. 
This might happen if there was an error before priv_data was allocated
and result in segfault.
 2011-06-08 19:51:31 +02:00
Diego Biurrun
5bd6ec6d59 options: Add missing braces around struct initializer. 
This fixes the warning:
libavformat/options.c:62:1: warning: missing braces around initializer [-Wmissing-braces]
 2011-06-08 15:01:02 +02:00
Diego Biurrun
b7847a3f2e mov: Remove leftover crufty debug statement with references to a local file. 2011-06-08 12:01:41 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Anton Khirnov
d9f80ea2a7 Move metadata API from lavf to lavu. 
Rename it to AVDictionary, since it will be used as such.  Tags
documentation and metadata conversion API is lavf-specific, so remains
there.
 2011-06-08 07:43:45 +02:00
Diego Biurrun
ac4a854811 Remove some non-compiling debug messages. 2011-06-08 00:45:47 +02:00
Diego Biurrun
02a8d43adf Replace some av_log/printf + #ifdef combinations by av_dlog. 2011-06-07 13:20:58 +02:00
Diego Biurrun
1f6b9cc31d Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG. 2011-06-07 13:20:58 +02:00
Diego Biurrun
d7cf5639e7 Replace some printf instances in debug code by av_log. 2011-06-07 13:20:57 +02:00
Diego Biurrun
dc25d79f49 Drop unnecessary directory prefixes from #include directives. 2011-06-07 10:31:26 +02:00
Luca Barbato
0e28e9ca8f flvenc: propagate error properly 
avio_flush can fail, in particular when used with the rtmp/librtmp
protocol.
 2011-06-06 10:53:19 -05:00
Anton Khirnov
b2592ea42c lavf: deprecate AVFormatParameters.time_base. 2011-06-06 06:46:10 +02:00
Anton Khirnov
abcedfac60 img2: add framerate private option. 2011-06-06 06:46:10 +02:00
Anton Khirnov
a915bf64cc img2: add video_size private option. 2011-06-06 06:46:10 +02:00
Anton Khirnov
f33e2a51d9 img2: add pixel_format private option. 2011-06-06 06:46:05 +02:00
Anton Khirnov
c1dcbfddf9 tty: add framerate private option. 2011-06-06 06:32:40 +02:00
Anton Khirnov
367732832f lavf,lavc: free avoptions in a generic way. 
It's simpler and less error-prone.

Fixes some memleaks along the way.
 2011-06-05 15:01:36 +02:00
Anton Khirnov
8346f60afb tty: factorise returning error codes. 2011-06-04 19:53:45 +02:00
Anton Khirnov
e762b1ce95 rawdec: add framerate private option. 2011-06-04 19:51:43 +02:00
Diego Biurrun
8d459acc10 Add missing #includes to make headers self-contained. 
This fixes 'make checkheaders'.
 2011-06-04 18:15:50 +02:00
Diego Biurrun
43b6c3eb18 mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. 2011-06-03 15:43:34 +02:00
Mans Rullgard
5e1166b31b Mark some variables with av_unused 
Most of these variables are only used in av_dlog statements, some
are required but not used by other macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-03 12:59:05 +01:00
Anton Khirnov
1f94c31f69 rawdec: initialize return value to 0. 2011-06-03 13:51:43 +02:00