RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 04:54:55 +00:00
Code Issues Projects Releases Wiki Activity
27,448 Commits 37 Branches 400 Tags 240 MiB
ce20edb7bd
Commit Graph

6858 Commits

Author SHA1 Message Date
Reimar Döffinger
ce20edb7bd Vorbis-in-Ogg: Do not set timebase to invalid values 
Avoids an assert when the sample rate is invalid and the timebase
is thus set to e.g. 1/0.
Sample file is http://samples.mplayerhq.hu/ogg/fuzzed-srate-crash.ogg

This is a quick fix for a crash, not a final solution.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-29 13:48:13 +00:00
Peter Ross
4d54df8e07 mpegtsenc: support CODEC_ID_AAC_LATM 
$subject. Have used this for loopback testing with mpegts.c.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch]

From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Sun, 9 Jan 2011 09:45:50 +1100
Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-28 22:33:57 +00:00
Dave Yeo
a0788cc627 rtspenc: include os_support.h for system without HAVE_POLL_H 
fix compile on OS/2

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 21:41:12 +01:00
Anton Khirnov
042950542d asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 21:33:45 +01:00
Mans Rullgard
362d8f7d9e os_support: make poll() fallbacks conditional on CONFIG_NETWORK 
poll() is only used by networking code, so the fallback should
only be built if networking is enabled.  Also remove CONFIG_FFSERVER
condition from the declarations.

This should fix building on systems without poll(), broken
by a8475bbdb6.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-28 17:23:19 +00:00
Stefano Sabatini
4fc9ff0ad6 Make the image2 demuxer log more verbose 
Add an error message in case the user requests to write more than one file
and the path does not contain a "%d" or "%0Nd" pattern.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 18:04:33 +01:00
Georgi Chorbadzhiyski
a7827a17c6 In mpegts "reserved_future_use" field must be set to 1 in SDT table 
According to EN 300 468 section 3.1 (Definitions):

   Unless otherwise specified within the present document all
   "reserved_future_use" bits is set to "1".

This was not the case for SDT generation so this patch fixes it.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 17:46:36 +01:00
Luca Barbato
f81c7ac70a rtsp: make ff_sdp_parse return value forwarded 
the sdp demuxer did not forward it at all while the rtsp demuxer assumed
a single kind of error
 2011-01-28 15:45:19 +01:00
Luca Barbato
a8475bbdb6 os: replace select with poll 
Select has limitations on the fd values it could accept and silently
breaks when it is reached.
 2011-01-28 15:45:19 +01:00
Diego Elio Pettenò
e628864033 Hide demuxers', muxers' and protocols' objects via the ld version script. 
This reduces the symbols exported by libavformat from 699 to 451.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-28 01:45:17 +00:00
John Stebbins
97b04f5ed3 mov: add support for little-endian utf16 chapter names 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +01:00
Janne Grunau
795ed278e6 movenc: byteswap codec_tag in mov_write_ms_tag 
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
 2011-01-28 01:06:57 +01:00
Baptiste Coudurier
f258964217 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Anton Khirnov
225b6d7fde mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 22:03:21 +00:00
Mans Rullgard
c4f8765ac5 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be" 
This reverts commit c34461b35b.
The wrong version of the patch was committed.
 2011-01-26 22:03:21 +00:00
Diego Elio Pettenò
2d162e3825 Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h. 
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:04 +00:00
Georgi Chorbadzhiyski
535638b55f mpegtsenc: set reserved bits to 1 in PCR field 
The reserved bits between PCR base and extension fields must be
set to 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 00:02:42 +00:00
Diego Elio Pettenò
57c4d01ec9 Make ff_rtsp_send_cmd_with_content_async static to rtsp.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 22:10:36 +01:00
Diego Elio Pettenò
a3dffc0627 Make ff_mxf_pixel_layouts static to mxf.c. 
Also make it an anonymous structure as never it is accessed by name.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Diego Elio Pettenò
101e1f6ff9 Make ff_interleave_compare_dts static to utils.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
c34461b35b mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
2934cd9dbf asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
93b78d1210 lavf: make a variant of ff_get_str16_nolen public 
It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Jai Menon
c0ae5152d1 ffmetaenc: Use correct format specifiers. 
Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
 2011-01-25 17:34:11 +00:00
Mans Rullgard
1e48cdaac3 tty: remove superflous #include <strings.h> 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 15:57:53 +00:00
Georgi Chorbadzhiyski
6e78c8ee94 mpegtsenc: remove unused variables 
Remove two variables that were not used and caused the following
warnings:

CC      libavformat/mpegtsenc.o
libavformat/mpegtsenc.c: In function 'mpegts_write_section':
libavformat/mpegtsenc.c:72:18: warning: unused variable 'ts'
libavformat/mpegtsenc.c: In function 'mpegts_insert_null_packet':
libavformat/mpegtsenc.c:586:18: warning: unused variable 'ts'

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 12:52:45 +00:00
Mans Rullgard
6081f8c4e2 avidec: make print_tag() a macro and remove related ifdefs 
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 02:43:28 +00:00
Diego Elio Pettenò
119cc033fc Make RTPFirstDynamicPayloadHandler static to rtpdec.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 01:45:34 +00:00
Diego Elio Pettenò
69ad22c7a7 Make ff_realmedia_mp3_dynamic_handler static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 01:37:32 +00:00
Diego Elio 'Flameeyes' Pettenò
73a0b19ba3 Don't check for DEBUG before using dprintf. 
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 00:25:50 +00:00
Diego Elio Pettenò
f0a8676958 Make dvenc.c functions static to the unit. 
Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 00:02:12 +00:00
Martin Storsjö
2762a7a28b rtspdec: Retry with TCP if UDP failed 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:49:36 +01:00
Martin Storsjo
e836b1b085 rtspdec: Move rtsp_read_pause up, next to rtsp_read_play 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:45 +01:00
Martin Storsjo
aeb2de1c82 rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:43 +01:00
Martin Storsjo
93e7490ee0 rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:39 +01:00
Martin Storsjo
fef5649a82 rtsp: Make make_setup_request a nonstatic function 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:36 +01:00
Martin Storsjö
2b0decf60b applehttp: Fix the key check in handle_variant_args 
The key string is supposed to contain the equals character,
too.  Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-24 20:19:37 +00:00
Kostya
dacbcd170a reindent after last commit 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 20:46:58 +01:00
Kostya
3bdc886c22 Extend WavPack demuxer and decoder to support >2 channel audio 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 20:46:58 +01:00
Anton Khirnov
22272f61bb mp3enc: support for id3v2.3 tags using a per-muxer AVOption 
fixes issue2562.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 02:06:14 +01:00
Anton Khirnov
cb6bc57681 id3v2: split tables for various ID3v2 versions 
This is needed for upcoming ID3v2.3 muxing support.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 02:06:10 +01:00
Anton Khirnov
8c3caf7fb1 mp3enc: handle errors in id3v2_put_ttag 
make the initialization of put clearer

this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478b

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 02:04:13 +01:00
Clément Bœsch
045b80e52d Move ID3v1 skip from decoder to demuxer 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 01:31:57 +01:00
Anton Khirnov
187e23478b mp3enc: add support for writing UTF-16 tags 
Also it gets rid of some mysterious magic numbers in code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 21:52:41 +00:00
Anton Khirnov
dccbd97d72 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>
 2011-01-21 20:21:51 +00:00
Anton Khirnov
4efd5cf34b avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:03 +00: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
Anton Khirnov
d66eff3685 id3v2: use an enum for encodings instead of magic numbers. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 18:42:10 +00:00
Anton Khirnov
d08928bbea Split mp3 demuxer and muxer into separate files. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 15:11:52 +00:00