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

382 Commits

Author SHA1 Message Date
Michael Niedermayer
85b2114759 Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864' 
* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864':
  avutil: make aes and sha api public
  handle malloc failures in ff_get_wav_header
  add xWMA demuxer
  mpegts: force the default timebase
  libavcodec: Bump micro after adding the dtx AVOptions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-15 04:50:06 +02:00
Max Horn
ca402f32e3 handle malloc failures in ff_get_wav_header 
ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.

To address this, change ff_get_wav_header to return an error if
allocation failed, and adapted all calling code to handle that error.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-14 13:56:09 +02:00
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
Carl Eugen Hoyos
f63e5a7410 Support Etymonix MPEG-2 video codec, fixes issue 1603. 
Originally committed as revision 20795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 22:38:49 +00:00
Ben Littler
4bae225126 add dvcs to dvvideo, fixes issue 1604 
Originally committed as revision 20786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-09 20:55:47 +00:00
Carl Eugen Hoyos
4b86926b95 Support AVI1 and AVI2 in avi as MJPEG. 
Fixes issue 1602.

Originally committed as revision 20781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 23:47:45 +00:00
Michael Niedermayer
483aad717e slif aka "SoftLab MPEG-2 I-frames Codec" support. 
Flipping one bit still is popular it seems as a means to create a new codec.
fixes issue1469.

Originally committed as revision 20679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 02:07:46 +00:00
Ben Littler
e47ca4f798 map VYUY fourcc to rawcodec 
fixes http://samples.mplayerhq.hu/V-codecs/ATI-VCR12/ATI/y422test.avi

Originally committed as revision 20432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 00:10:10 +00:00
Ben Littler
13547dd11f add 2vuy fourcc to riff.c , fixes samples/V-codecs/2vuy.avi 
Originally committed as revision 20383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 17:37:41 +00:00
Ben Littler
9853bbb21a add some raw codec fourccs, fixes: 
samples/V-codecs/

P422.AVI
UYNV.AVI
UYNY.AVI
V422.AVI
YUNV.AVI

Originally committed as revision 20379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 15:57:28 +00:00
Carl Eugen Hoyos
94ec3aca56 Support FourCC mjpa as MJPEG. 
Fixes issue 1492.

Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 22:43:19 +00:00
Carl Eugen Hoyos
bc2d2a07d5 Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0. 
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 14:46:06 +00:00
Reimar Döffinger
d8b35b8586 Add decoder for "forward uncompressed". 
Fixes issue 1467.

Originally committed as revision 20226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 18:15:57 +00:00
Carl Eugen Hoyos
dd9d5a1ef8 Support Midvid JPEG Video Codec (still flipped). 
Originally committed as revision 20218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 22:00:14 +00:00
Carl Eugen Hoyos
54089ecd5a Support Intel JPEG Library Video Codec (still flipped). 
Originally committed as revision 20217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 21:35:26 +00:00
Aurelien Jacobs
188842ef7a fix riff subtitle timebase 
Originally committed as revision 19607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-07 23:57:52 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +00:00
Jason Garrett-Glaser
bc7ea1e5cf Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file. 
Originally committed as revision 19219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-18 19:31:12 +00:00
Jason Garrett-Glaser
fc3fc0293d Add new FOURCC (0x0003) for raw DIB video, set flip flag accordingly. 
Fixes a few AVI files from what is probably a mobile phone video camera.

Originally committed as revision 19172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 17:39:56 +00:00
Jai Menon
8e6e9bacc4 Associate the 0x6c75 TwoCC used in certain Kodak cameras 
to the PCM Mu-law decoder.
Fixes Issue 1178.

Originally committed as revision 19166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 13:21:01 +00:00
Jimmy Christensen
94d3d6a468 DPX (Digital Picture Exchange) image decoder 
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 05:29:29 +00:00
Michael Niedermayer
71b0654cc6 Support YVU9 AVI 4cc. 
Fixes issue1068.

Originally committed as revision 18952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-26 03:51:00 +00:00
Ben Littler
f9928b7e80 map dvh1 fourcc to dv, fixes incoming/dvh1_sample 
Originally committed as revision 18951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-26 01:14:10 +00:00
Baptiste Coudurier
9c4e266c1c v210 avi fourcc, v210_720p.avi 
Originally committed as revision 18802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-12 19:58:13 +00:00
Baptiste Coudurier
c20a305bca dvh1 avi fourcc, dvh1_sample_truncated.avi, issue #1034 
Originally committed as revision 18739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 04:30:08 +00:00
Michael Niedermayer
5aef84623a Add zygo fourcc. 
Originally committed as revision 18628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-19 21:24:36 +00:00
Thilo Borgmann
0dccbba02c Add 'PNG1' to PNG fourcc codes. 
Patch by Thilo Borgmann thilo DOT borgmann _AT_ gXXglemail.cXm.

Originally committed as revision 18415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 12:18:04 +00:00
Zhentan Feng
c81604f862 Reduce code duplication. 
Patch by Zhentan Feng, spyfeng gmail

Originally committed as revision 18377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 16:01:10 +00:00
Ronald S. Bultje
4bce3ba480 Reindent after r18372. 
Originally committed as revision 18373 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 03:06:08 +00:00
Ronald S. Bultje
6e9f56c127 Add waveformat-extensible support in the wav muxer. 
Patch (GSoC qualfication task) by Zhentan Feng spyfeng gmail com, see
"[FFmpeg-devel] Add waveformat extensible support in wav muxer (SoC
qualification task)" thread on mailinglist.

Originally committed as revision 18372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 03:04:57 +00:00
Ben Littler
13b47b4012 add another dv fourcc CDVH 
Originally committed as revision 18293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-01 00:45:28 +00:00
Kostya Shishkov
c21fbefb9d Add AURA 1 and 2 codec IDs and register their FOURCCs 
Originally committed as revision 18141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 07:40:22 +00:00
Ben Littler
3596f4e076 sn40 avi fourcc decodes with ffodivx 
Originally committed as revision 17928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 01:36:25 +00:00
Michael Niedermayer
31f2616db8 Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php. 
partially fixes issue862.

Originally committed as revision 17475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 15:32:56 +00:00
Alex Converse
528374980e Add Divio MPEG-4 FOURCC (M4CC) 
Originally committed as revision 17465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 23:09:24 +00:00
Eli Friedman
e80c73b3c1 Add support for fourcc "SP54". 
Patch by Eli Friedman eli D friedman A gmail

Originally committed as revision 16958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 22:43:51 +00:00
Stefan Gehrer
4becee2343 ADPCM found in Xbox wav files can be decoded with 
existing CODEC_ID_ADPCM_IMA_WAV

Originally committed as revision 16883 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 05:53:04 +00:00
Ben Littler
bf23f6dc33 pvez avi fourcc is truemotion1 
Originally committed as revision 16850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-29 15:33:19 +00:00
Ben Littler
76af2edc44 add EM4A fourcc , works for: 
http://av.watch.impress.co.jp/docs/20040929/xf.asf

Originally committed as revision 16729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 12:17:40 +00:00
Ben Littler
5823e4b8f6 another mpeg4 fourcc 
Originally committed as revision 16702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 16:19:13 +00:00
Ben Littler
d7c6552c7c add T263. works on samples/V-codecs/T263/ 
Originally committed as revision 16685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 16:11:46 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
9ce6c13879 export gcd function as av_gcd() 
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 11:13:33 +00:00
Ben Littler
e2260faa42 add LM20 mimic in avi fourcc 
Originally committed as revision 16645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 19:05:09 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Ben Littler
ed0879eda9 add SLMJ fourcc to mjpeg 
Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 17:10:10 +00:00
Ben Littler
54f8abde93 cosmetics: CJPG is from Creative Webcam 
Originally committed as revision 16497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 18:00:51 +00:00
Ben Littler
949462b32e fourcc CJPG is sequential jpeg 
Originally committed as revision 16496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 17:51:03 +00:00
Ben Littler
c26436ec46 add amr in avi riff tags 
Originally committed as revision 16303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-24 02:20:07 +00:00
Carl Eugen Hoyos
9f2ace74ef Fix two identical warnings when compiling riff.c and nuv.c with icc: 
warning #188: enumerated type mixed with another type

Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:12:44 +00:00
Ben Littler
f86cd76138 add MPNG fourcc 
fixes http://sceneish.ath.cx/stuff/netmap/netmap.avi

Originally committed as revision 16163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:22:53 +00:00
Ben Littler
4a49a5fdfc two more mpeg4 fourccs and one msmpeg4v3 from uncommon codec list 
Originally committed as revision 16162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:20:11 +00:00
Ben Littler
a9cf309b96 QIVG fourcc, fixes http://rodweb.dip.jp/partner/check.avi 
Originally committed as revision 16161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:49:26 +00:00
Ben Littler
c6340f86a3 add rpza avi fourcc 
Originally committed as revision 16160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:42:10 +00:00
Ben Littler
41b0534a7a add another mpeg4 avi fourcc from uncommon codecs list 
Originally committed as revision 16079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 15:34:55 +00:00
Mike Melanson
65fec2d98f add 'ACDV' FourCC (which is just complete JPEG files in individual AVI 
frames) and 'azpr' FourCC (which is Apple's 'rpza', encapsulated in AVI
instead)

Originally committed as revision 16052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 07:49:05 +00:00
Ben Littler
6cffaea8db add mpeg2 fourcc and aac format tag from asf 
Originally committed as revision 16036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-08 20:09:15 +00:00
Ben Littler
62d6f73edc add VX1K h263 and DMK2 mpeg4 avi fourccs 
Originally committed as revision 16009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-05 14:59:41 +00:00
Ben Littler
26e8d342c0 add fourccs from avi files 
Originally committed as revision 15995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 21:44:29 +00:00
Michael Niedermayer
b8cf645bd2 add GEOX fourcc for mpeg4 
Originally committed as revision 15992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 16:49:58 +00:00
Ben Littler
26ae363e06 add FFDS fourcc, ok'd by kostya 
fixes FFDS files in http://tranquillity.ath.cx/uncommon_video_codecs_final.txt

Originally committed as revision 15989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 13:53:13 +00:00
Peter Ross
4fd71a0ee8 Decode audio channel layout from RIFF/WAV file format. 
Originally committed as revision 15774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-05 09:22:13 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Benjamin Larsson
faeedbbb06 Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work 
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 10:59:42 +00:00
Kostya Shishkov
b30cb420cf Add fourcc for MS RLE4 
Originally committed as revision 15357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-18 05:25:29 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Baptiste Coudurier
24b8aa84d0 set default bps to 16 in wav header 
Originally committed as revision 15239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 04:17:15 +00:00
Baptiste Coudurier
235a51ad31 simplify bps code by using av_get_bits_per_sample 
Originally committed as revision 15215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 02:20:33 +00:00
Baptiste Coudurier
52cf395407 Fix msgsm in wav, do not set blkalign to frame size, this is wrong, 
all samples have correct blkalign set to 65

Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 23:19:53 +00:00
Peter Ross
57406d8eb8 Make RIFF-based demuxers handle F32LE and F64LE PCM audio. 
Originally committed as revision 14835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 10:54:30 +00:00
Benjamin Larsson
1b46683c80 FOURCC addition: added 3IV2, another mpeg4 id. incoming/video_3iv2/video_3iv2.avi 
Originally committed as revision 14681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 15:34:29 +00:00
Peter Ross
4e0e6888a4 Support muxing of Zork PCM audio into RIFF formats. 
Originally committed as revision 14617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 10:38:25 +00:00
Anuradha Suraparaju
eb64714c3a Add entry for Dirac codec. 
Patch by Anuradha Suraparaju anuradha rd bbc co uk

Originally committed as revision 14151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-10 11:41:06 +00:00
Michael Niedermayer
c8b9377d15 Make ac3 in avi work better. 
fixes issue355.

Originally committed as revision 13406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 00:05:30 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Aurelien Jacobs
b847847a0c cosmetics: remove some empty lines 
Originally committed as revision 12404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 00:48:36 +00:00
Aurelien Jacobs
01ccf45b92 remove useless and misleading comments 
Originally committed as revision 12403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 00:45:25 +00:00
Aurelien Jacobs
36b0782e71 consistent use of MKTAG() in the codec_bmp_tags table 
Originally committed as revision 12401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:43:55 +00:00
Aurelien Jacobs
ab0b2e559a cosmetics: alignment of the codec_bmp_tags table 
Originally committed as revision 12400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:34:14 +00:00
Mike Melanson
d98878f423 recognize the CLJR FourCC (Cirrus Logic AccuPak) 
Originally committed as revision 12391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 04:18:48 +00:00
Michael Niedermayer
a7805e2983 Fallback to sample rate if bit rate is 0. This avoids 0 timebases in nut. 
Originally committed as revision 12294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:47:30 +00:00
Michael Niedermayer
2401daaf39 add cdvc 
(from a patch by Dmitry Vassiliev // slydiman mail ru)

Originally committed as revision 12279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-29 11:41:57 +00:00
Benjamin Larsson
800b9c24b7 Add more riff IDs to support remuxing. 
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 20:34:44 +00:00
Diego Biurrun
8af9090f4f cosmetics: Sort and prettyprint codec_wav_tags[]. 
Originally committed as revision 12192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 23:02:47 +00:00
Benjamin Larsson
7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers. 
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-23 23:30:41 +00:00
Christophe Lorenz
23ef05756e Add dv50 tag to support samples with dv50 fourcc in AVI. 
patch by christophelorenz  christophelorenz gmail com

Originally committed as revision 11859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 12:18:00 +00:00
Baptiste Coudurier
32bbb99d0a HDYC fourcc, sample hdyc/Test2.avi 
Originally committed as revision 10541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-21 18:23:46 +00:00
Aurelien Jacobs
6369638bf0 loosen dependencies over allformats.h 
Originally committed as revision 10513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 23:00:44 +00:00
Michael Niedermayer
a11c2a2c66 support silly PCM variant used by zork nemesis 
fixes audio decoding of T000A11C.AVI

Originally committed as revision 9831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-30 02:05:16 +00:00
Michael Niedermayer
8950f82879 detect voxware (closes issue39) 
Originally committed as revision 9809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-27 11:37:56 +00:00
Aurelien Jacobs
45da8124a0 Move public API functions av_codec_get_tag() and av_codec_get_id() 
into a file which is compiled un-conditionally (utils.c).

Originally committed as revision 9590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-11 12:45:14 +00:00
Måns Rullgård
b3633dee58 remove deprecated codec_get_{bmp,wav}_{id,tag}() 
Originally committed as revision 9530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 01:49:24 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Baptiste Coudurier
e5f0be5a0c add MMES fourcc, matrox mpeg2 in avi files 
Originally committed as revision 9234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-06 15:52:53 +00:00
Michael Niedermayer
fc1f90d4e9 move jpegls up, fixes sf bug #1629152 
Originally committed as revision 9165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 23:42:37 +00:00
Benjamin Larsson
10e26bc782 Atrac3 decoder. 
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-17 20:53:39 +00:00
Michael Niedermayer
91aeec1bc7 WMVA 
Originally committed as revision 8581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-01 01:09:56 +00:00
Baptiste Coudurier
beef9ba9e2 add AVRn fourcc 
Originally committed as revision 8572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-31 16:27:22 +00:00
Baptiste Coudurier
bad0cefbdd add IJPG fourcc, to play m_ijpg.avi 
Originally committed as revision 8530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-26 18:41:12 +00:00
Bobby Bingham
2c0c00cb14 Targa (.tga) encoder, 
patch by Bobby Bingham % uhmmmm A gmail P com %
Only handles 24-bit BGR and 8-bit grayscale, no RLE at the moment either.
Original thread:
Date: Mar 11, 2007 7:58 PM
Subject: [Ffmpeg-devel] [PATCH] Targa encoder

Originally committed as revision 8411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-15 12:23:08 +00:00
Michael Niedermayer
140fba0985 jpeg fourcc 
Originally committed as revision 8310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 11:30:48 +00:00
Michael Niedermayer
0a3692cd82 be less noisy 
Originally committed as revision 8107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-24 01:51:37 +00:00
Michael Niedermayer
9376710d06 warn if bps from user and what will be stored missmatches 
Originally committed as revision 8044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 16:20:08 +00:00
Michel Bardiaux
5b77a81a8d Remove code duplicated between adpcm.c and riff.c 
Originally committed as revision 8042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 14:31:43 +00:00
Michel Bardiaux
346a655d46 Add support for MS-GSM codec 
Originally committed as revision 8039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 11:09:47 +00:00
Baptiste Coudurier
72fd40bd3a add waveformatextensible support 
Originally committed as revision 7714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-25 21:56:06 +00:00
Michael Niedermayer
bb85077fc9 remove now useless codec_tag setting code in muxers 
Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 12:44:58 +00:00
Michael Niedermayer
6c77805fc8 get rid of the [4] limitation of codec tag lists 
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 12:08:31 +00:00
Michael Niedermayer
7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat 
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 01:39:17 +00:00
Aurelien Jacobs
9110a0e32d Add support for VP60 and VP61. 
Originally committed as revision 7329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-17 22:00:12 +00:00
Michael Niedermayer
7b24f9b425 libnut uses "MP3 " for mp3 
Originally committed as revision 6963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 00:29:49 +00:00
Baptiste Coudurier
cbee7a6944 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used 
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-09 11:37:30 +00:00
Diego Biurrun
171b361e01 Remove illegal FourCC values. 
Originally committed as revision 6941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-08 10:48:15 +00:00
Kostya Shishkov
84ed36da85 IMC decoder 
Originally committed as revision 6839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-30 13:48:48 +00:00
Diego Biurrun
39051d5d6e Replace FLAC FourCC by TwoCC. 
Originally committed as revision 6708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-16 11:18:26 +00:00
Diego Biurrun
6ae177aa3b Add a note about illegal codec IDs. 
Originally committed as revision 6681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 00:02:33 +00:00
Diego Biurrun
7e547cb4c3 Add codec ID for Shorten audio. 
Originally committed as revision 6680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 00:01:25 +00:00
Yong
104f8c10b8 Add fourccs for Wavpak and TTA 
Patch by yong ||| y0ngc |a| yahoo dot com |||

Originally committed as revision 6579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 18:30:41 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Michael Niedermayer
4b1a1a2a69 flac fourcc (fixes mplayer -demuxer 35 with flac) 
Originally committed as revision 6569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-06 18:36:58 +00:00
Michael Niedermayer
92eb82325e prevent >16bit tags to be truncated and used in creating .wav files 
Originally committed as revision 6568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-06 18:20:40 +00:00
Philippe De Muyter
3c61983828 add support for grayscale rawvideo avi 
patch by Philippe De Muyter %phdm A macqel P be%
Original thread:
Date: Sep 15, 2006 10:18 AM
Subject: [Ffmpeg-devel] [PATCH] ffmpeg does not recognize his own grayscale rawvideo avi's

Originally committed as revision 6255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 09:42:51 +00:00
Aurelien Jacobs
aa8f4cee32 add a VP6F fourcc for apps which rely on fourcc 
Originally committed as revision 6232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-12 00:06:44 +00:00
Aurelien Jacobs
5ce117c37c VP5 and VP6 video decoder 
Originally committed as revision 6213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-09 17:19:37 +00:00
Javier Garcia
af5ba08e83 Allow RGB Raw encoding 
Patch by Javier garcia % garcofra A hotmail P com %
Original thread:
Date: Aug 30, 2006 1:49 PM
Subject: [Ffmpeg-devel] [PATCH] RGB Raw ecoding

Originally committed as revision 6180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-06 09:00:11 +00:00
Kostya Shishkov
eb57c88973 VMware Video decoder (fourcc: VMnc) 
Originally committed as revision 6171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-05 04:37:14 +00:00
Kostya Shishkov
04ae12e91b WVC1 is now decodeable with VC-1 decoder. 
Originally committed as revision 6163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-04 04:25:47 +00:00
Baptiste Coudurier
f31065f6e5 add codec id and tag for JPEG 2000 
Originally committed as revision 6076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 14:13:57 +00:00
Steve L'Homme
0b23d689d8 Add YV12 support, patch by Steve Lhomme % steve P lhomme A free P fr % 
Original thread:
Date: Aug 17, 2006 5:45 PM
Subject: Re: [Ffmpeg-devel] [PATCH] AVISynth support

Originally committed as revision 6018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-18 07:55:08 +00:00
David Conrad
8331891957 Support AAC audio in AVI with tag 0xff 
Patch by David Conrad ( davedc_ | umbc edu )

Originally committed as revision 5963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-08 22:16:34 +00:00
Stefan Gehrer
67630cff64 add new tag 'CAVS' for Chinese AVS codec 
Originally committed as revision 5847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-29 08:50:29 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c 
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-12 00:09:34 +00:00
Anton Khirnov
6173a8fe5d riff: remove a write-only variable 2012-10-22 08:49:58 +02:00