virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
29,043 Commits 37 Branches 400 Tags 465 MiB
3338be24e8
Commit Graph

179 Commits

Author SHA1 Message Date
Michael Niedermayer
ab8cfd45f8 Merge remote branch 'qatar/master' 
* qatar/master:
  avio: add more documentation for AVIOContext.
  Parse sprite data for WMVP and WVP2, and decode sprites for the latter
  Replace outdated info on the FAQ
  Redefine sameq
  pad: fix example explanation
  gradfun: add notice from the MPlayer manual
  eval: add support for trunc, ceil, and floor functions
  documentation: add setdar and setsar description to filters.texi
  avio: document some members of AVIOContext.
  avio: document avio_close().
  avio: cosmetics, vertically align comments.
  avio: cosmetics, group the reading functions.
  avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
  avio: cosmetics, move AVIOContext to start of the file.
  avio: update file header.
  os: fix OpenBSD/PowerPC compilation
  pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  oggdec: fix demuxing chained audio streams
  fix typo

Conflicts:
	doc/filters.texi
	libavformat/avio.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-11 04:08:08 +02:00
Alberto Delmás
768c525114 Parse sprite data for WMVP and WVP2, and decode sprites for the latter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-10 10:07:49 +02:00
Peter Ross
de174d0d25 riff: add ATRAC3+ guid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Peter Ross
aa9380c89c ff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Peter Ross
36ffabc4ee move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Peter Ross
c1309b27d2 move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04:00
Peter Ross
d34ca1cfe3 Add audio codec 0x1600 (ADTS AAC) 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:11:01 -05:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
0abdb29317 lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:22 -05:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -05:00
Anton Khirnov
b7effd4e83 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>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Peter Ross
50d83b2005 Add audio codec 0x1602 (AAC LATM) 
Originally committed as revision 26273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:11:41 +00:00
Carl Eugen Hoyos
d267b339e4 Lagarith decoder by Nathan Caldwell, saintdev at gmail 
Originally committed as revision 26270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 21:22:15 +00:00
Carl Eugen Hoyos
504530bfba Set blkalign to 3840 (maximum bytes per frame) for AC-3 in avi. 
Fixes playback for corner-cases like 32kHz 320kb.

Originally committed as revision 26242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 13:30:32 +00:00
Peter Ross
773d892a31 move ff_get_bmp_header under CONFIG_DEMUXERS block 
Originally committed as revision 26182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-01 03:24:10 +00:00
Carl Eugen Hoyos
f6bf6e511d Set blkalign to maximum framesize to allow playback on WMP (see issue 2455 and issue 2446). 
Originally committed as revision 26167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-30 14:21:14 +00:00
Peter Ross
456a70aeb8 add ff_get_bmp_header 
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:23:44 +00:00
Andrew Wason
3d305fd071 Add FourCC yuvs for rawvideo (PIX_FMT_YUYV422). 
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 23:15:51 +00:00
Peter Ross
e8ffb2fa4c Add G.722 to RIFF codec list 
Originally committed as revision 25837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-28 03:01:00 +00:00
Kostya Shishkov
cba322d76d Make WMV3 decoder attempt to decode WMVP as well 
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 13:56:50 +00:00
Zhou Zongyi
4383692896 Add R10k decoder. 
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-13 22:08:51 +00:00
Ben Littler
f0feb4d72f add WAWV fourcc, works on V-codecs/WAWV.avi 
Originally committed as revision 24991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 16:43:33 +00:00
Carl Eugen Hoyos
2d91366cc2 Make MP43 the default fourcc for msmpeg4v3: 
DIV3 is not supported on default XP and Vista installations (MP43 is).

Originally committed as revision 24343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 09:44:21 +00:00
Tomas Härdin
77d3f1f792 Added M701 codec_tag for mpeg2video 
Originally committed as revision 23513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-07 11:27:26 +00:00
Carl Eugen Hoyos
74c853b621 Samsung uses SIPP as FourCC for MPEG-4 ASP. 
Originally committed as revision 23309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 10:35:50 +00:00
Stefano Sabatini
781cf5fd41 Add missing codec id <-> codec tag entries: 
CODEC_ID_RAWVIDEO <->  Y41B
CODEC_ID_RAWVIDEO <->  Y42B
CODEC_ID_RAWVIDEO <->  YUV9
CODEC_ID_RAWVIDEO <->  YVU9

These codec tags are listed in fourcc.org, and are already listed in
libavcodec/raw.c:ff_raw_pix_fmt_tags as AVI tags.

Originally committed as revision 23296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 20:35:01 +00:00
Google
6c7c62939b Add VP80 fourcc 
Patch by Google

Originally committed as revision 23193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-19 16:50:12 +00:00
Stefano Sabatini
73762de18e Add NV12 and NV21 AVI tags. 
Both are listed in fourcc.org.

Originally committed as revision 23145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-16 07:56:31 +00:00
Francesco Lavra
f10d3d343e Add FourCC MJPG for CODEC_ID_JPEGLS. 
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 23:19:19 +00:00
Stefano Sabatini
b43f432c8c Add support to the Y411 codec tag, corresponding to the rawvideo pixel 
format uyyvyy411.

The codec tag is referenced in fourcc.org.

Originally committed as revision 23072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 22:56:04 +00:00
Anssi Hannula
337104ac1f Fix FourCC when remuxing VP6F, regression introduced in r22941. 
Patch by Anssi Hannula, anssi D hannula A iki fi

Originally committed as revision 22985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-28 07:57:07 +00:00
Christian Schmidt
03cb8458ce Support VP6F in Matroska. 
Patch by Christian Schmidt, schmidt digadd de

Originally committed as revision 22941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 08:57:28 +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
Anton Khirnov
63100f5885 riff: don't pad extradata when writing ASF. 
Patch by Anton Khirnov mirror(moc liamg saksyw)

Originally committed as revision 22539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 08:49:02 +00:00
Daniel Verkamp
bf35412201 Kega Game Video (KGV1) decoder 
Originally committed as revision 22364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 01:03:09 +00:00
Ben Littler
4bf2b9e8f3 add netspeak gsm and truespeech wav format tags to riff.c 
Originally committed as revision 21797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 17:57:24 +00:00
Michael Niedermayer
86d58bcfd9 Add GEOV fourcc (issue971). 
Originally committed as revision 21768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 01:37:53 +00:00
Ben Littler
5bc3fc2187 add uldx fourcc to mpeg4 in riff.c 
Originally committed as revision 21279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 03:57:01 +00:00
Ben Littler
6667d5a5e5 add vspx fourcc to mpeg4 in riff.c 
Originally committed as revision 21269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 19:25:49 +00:00
ami_stuff
8be7ac98ca Support decoding of SoftLab-NSK VideoTizer. 
Patch by ami_stuff, ami_stuff o2 pl

Originally committed as revision 21245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 13:13:49 +00:00
Daniel Verkamp
9df9b810c5 Handle more ADPCM codecs in av_get_bits_per_sample(). 
This removes some special-case code from riff.c.
CODEC_ID_ADPCM_G726 is still handled in riff.c as before because it is
not guaranteed to be fixed 4 bits per sample.

Originally committed as revision 21037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-06 21:51:20 +00:00
Ben Littler
418a287cae add another mjpeg fourcc to riff.c list 
Originally committed as revision 21032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-05 20:14:50 +00:00
Michael Niedermayer
2c2a167ca7 It appears that waveformatextensible is mandatory for more cases than 
just channels>2. The 16bit case is from MSDN, the 48khz is from less a reliable
www page (sorry i cant find the URL anymore).

Originally committed as revision 20892 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-18 06:03:12 +00:00
Reimar Döffinger
4aaab0a328 Add decoder for R210 (uncompressed 10-bit RGB) codec. 
Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-17 18:56:56 +00:00
Carl Eugen Hoyos
ab176fdffb (Partly) support Metasoft MJPEG Codec, fixes half of issue 1611. 
Originally committed as revision 20796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 23:06:23 +00:00