virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
37,209 Commits 37 Branches 400 Tags 462 MiB
01fcbdf9ce
Commit Graph

38 Commits

Author SHA1 Message Date
Michael Niedermayer
d2cab951e3 oggdec: Make sure start time correction is applied once to each stream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-24 23:13:57 +02:00
Michael Niedermayer
f9ecb849ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-09 04:47:19 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Nicolas George
e61b83d29e Ogg: add support for Xiph's CELT (Opus) codec. 
This patch also introduces CODEC_ID_CELT.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
 2011-04-19 15:49:32 +02:00
Clément Bœsch
8f3eebd663 oggdec: simplify audio chained ogg streams support 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-15 11:45:03 +02:00
Clément Bœsch
47dec30edb oggdec: fix demuxing chained audio streams 
Chained ogg served by icecast and mpd should demux
properly now.

Fixes issue2337

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-10 04:33:15 +02:00
David Conrad
49c2d29089 oggdec: Remove write-only variable 
Originally committed as revision 22889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 12:21:29 +00:00
James Darnley
66061a1220 Add VorbisComment writing to FLAC files. 
Patch by James Darnley <james darnley at gmail>.

Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 13:36:43 +00:00
David Conrad
81b743eb10 oggdec: Pass packets to header() until the stream is done with them 
This fixes some old ogm files that had the 3rd vorbis header after a data
packet in another stream. This is invalid in ogg, but this change shouldn't
affect the behaviour of any valid file.

Originally committed as revision 22478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:17:01 +00:00
David Conrad
533c30fced Const correctness for vorbis_comment 
Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:47 +00:00
David Conrad
b53cde48bd oggdec: Metadata is per-stream; don't merge multiple streams' together 
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:44 +00:00
David Conrad
e4d2d8c5d7 Add ff_ prefix to vorbis_comment 
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:39 +00:00
David Conrad
d8b91fae1d oggdec: Seek to keyframes 
Originally committed as revision 22463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:18:00 +00:00
David Conrad
32ad869284 oggdec: Parse skeleton to determine the start time of each stream 
Originally committed as revision 22457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:40 +00:00
David Conrad
296bdf9cf1 oggdec: Check that we have a codec in gptopts (needed for skeleton) 
Originally committed as revision 22456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:36 +00:00
David Conrad
dfaed51f04 oggdec: Move ogg_find_stream and ogg_gptopts to oggdec.h 
(skeleton will need them)

Originally committed as revision 22455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:33 +00:00
David Conrad
73823cb941 oggdec: Save offset of the page needed to reconstruct the current packet 
Originally committed as revision 22453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:24 +00:00
David Conrad
ecc0027bc6 Fix playback with invalid files that don't set the continuation flag for 
pages that continue packets started in prior pages.
Fixes issue1248

Originally committed as revision 21688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 10:13:03 +00:00
David Conrad
2d4970d88d oggdec: Set dts when known 
Originally committed as revision 21134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 05:51:09 +00:00
David Conrad
24ca518bd1 Add support for dirac in ogg 
Originally committed as revision 21128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 00:31:52 +00:00
David Conrad
5e15c7d95b Fix PTS for OGM codecs. 
Fixes issue251

Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 20:18:43 +00:00
Justin Ruggles
15299b3821 Calculate correct packet durations when demuxing Ogg/Speex. This involves 
determining if there is any delay in the first packet and/or any truncation in
the final packet.

Originally committed as revision 20216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 21:30:03 +00:00
Justin Ruggles
d7bb185f99 Add a VorbisComment metadata conversion table and use it in the FLAC and 
Ogg demuxers.

Originally committed as revision 19186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 22:45:58 +00:00
Daniel Verkamp
fc430e8fab Warning fix: Make ogg_stream.codec const 
This matches the return value of ogg_find_codec and fixes
"libavformat/oggdec.c:333: warning: assignment discards qualifiers from
pointer target type"

Patch by Daniel Verkamp (daniel - drv . nu)

Originally committed as revision 18769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-06 23:02:26 +00:00
David Conrad
1fa9726cf6 Document ogg_codec's header function 
Originally committed as revision 18100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 08:03:30 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Måns Rullgård
77be08eeb1 OGG: untypedef demuxer structs 
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-06 01:50:56 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Reimar Döffinger
547ea47d4f Add ff_ prefix to ogg_codec_t structs 
Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 17:37:43 +00:00
Reimar Döffinger
cd34bc7617 Make ogg_codec_t descriptions const 
Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 17:09:15 +00:00
Michael Niedermayer
c5e56a813b Revert r14497 
Log:
	Add missing header #includes.
Policy violation (change not approved by maintainer)
and while discussions where ongoing and no consensus has been reached.

Originally committed as revision 14500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-01 22:29:29 +00:00
Diego Biurrun
2e11268ea9 Add missing header #includes. 
Originally committed as revision 14497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-01 16:29:26 +00:00
Reimar Döffinger
cb4ddf7765 Add support for speex in ogg 
Originally committed as revision 11878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-06 12:37:37 +00:00
Reimar Döffinger
c901197693 String pointers of ogg_codec_t should have const attribute. 
Originally committed as revision 11860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 12:32:25 +00:00
Diego Biurrun
5f359c8d3e cosmetics: sort ogg_codec_t list 
Originally committed as revision 11810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-02 14:55:57 +00:00
Reimar Döffinger
2331e31c23 Add support for ogg text subtitles. 
Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-31 22:30:55 +00:00
Måns Rullgård
e1a794b272 set PKT_FLAG_KEY for Theora and OGM streams 
Originally committed as revision 11002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-11 21:56:18 +00:00
Diego Biurrun
a0ddef24ce Rename ogg2.[ch] to oggdec.[ch]. 
Originally committed as revision 10943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 20:22:32 +00:00