virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
37,512 Commits 37 Branches 400 Tags 467 MiB
9b9bf5ab73
Commit Graph

83 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
09f25a9cb0 Allow decoding of uyvy422 CYUV with -vcodec rawvideo. 
FourCC CYUV can be Creative YUV and uyvy422 rawvideo.
 2012-01-06 00:59:08 +01:00
Michael Niedermayer
3be1a4ba9a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: always align height by 32 pixel
  raw: add 10bit YUV definitions
  nut: support 10bit YUV
  mpegvideo_enc: separate declarations and statements
  oma: make header compile standalone
  vp3: Reorder some functions to fix VP3 build with Theora disabled.
  build: fix standalone compilation of ADX encoder
  build: fix standalone compilation of ADPCM decoders
  build: fix standalone compilation of mpc7/mpc8 decoders
  4xm: Use bytestream2 functions to prevent overreads
  bytestream: add a new set of bytestream functions with overread checking
  mpegts: Suppress invalid timebase warnings on DMB streams.
  mpegts: Fix typo in handling sections in the PMT.
  vc1dec: Use the right pointer type for the tmp pointer

Conflicts:
	libavcodec/4xm.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-21 03:40:53 +01:00
Luca Barbato
91b1e6f0c6 raw: add 10bit YUV definitions 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-21 00:00:03 +01:00
Diego Biurrun
12bd8532cf Synchronize various 4CCs and codec tags from FFmpeg. 2011-10-04 11:58:53 +02:00
Carl Eugen Hoyos
318fd9dac2 Remove non-existing fourcc " Y8". 
This reverts a line of r1842.
 2011-08-01 01:26:55 +02:00
ami_stuff
3950376b8b Support fourcc YV24. 
Fixes ticket #306.
 2011-07-06 10:05:08 +02:00
ami_stuff
9df1d329a5 Support fourcc Y8 (ticket 308). 2011-06-27 10:03:21 +02:00
ami_stuff
90d475a9e7 Support fourcc YV16 (ticket 307). 2011-06-27 09:40:53 +02:00
ami_stuff
67e7dc5404 rawdec: Fix decoding of QT WRAW files. 
From some tests it results that:
1. All of the AVI/MOV WRAW files need to be flipped.
2. MOV WRAW files need to use AVI color modes.
3. Assigning PAL8 mode by default to WRAW codec is not correct.
 2011-06-21 22:18:59 +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
d352df0931 rawvideo: Support auv2 fourcc. 2011-06-21 21:33:58 +02:00
ami_stuff
040e1c67ed rawdec: fix decoding of QT WRAW files 
Fix decoding of QT WRAW files.

From some tests it results that:

1. all of the AVI/MOV WRAW files (at least from the link posted
   to the trac ticket #108) need to be flipped
2. mov WRAW files need to use AVI color modes
3. assigning PAL8 mode by default to WRAW codec is not correct

Fix decoding of file CarltonMovie2.mov, fix trac issue #108.
 2011-05-25 00:13:09 +02:00
Carl Eugen Hoyos
410ca3bc2d Support Digital Voodoo SD 8 Bit in mov (ticket 195). 2011-05-13 01:08:01 +02:00
Peter Ross
87e45ae13d rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-28 07:25:28 +02:00
Baptiste Coudurier
e91946ed23 Rename y400a to gray8a. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 21:36:30 +02:00
ami_stuff
3e1c59ebc6 Support fourcc auv2. 
Fixes ticket #101.
 2011-04-25 00:44:48 +02:00
Peter Ross
7181627686 rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE 2011-03-26 13:24:43 +11: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
Baptiste Coudurier
9a191b3a21 Support gray16be and rgb48be in mov 
Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-15 09:14:00 +00:00
Stefano Sabatini
d588e3f59b Add support to B4BY and R4BY NUT codec tags added in NUT r672. 
Originally committed as revision 23508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-06 18:29:42 +00:00
Michael Niedermayer
63455b8c7e bgr/rgb444 for nut 
Originally committed as revision 23504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-06 11:43:53 +00:00
Baptiste Coudurier
3511242d22 More mov rawvideo fourcc supported by the rawvideo decoder 
Originally committed as revision 23481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-04 23:33:36 +00:00
Stefano Sabatini
48a783f3d7 Remove weird empty line and perform vertical align. 
Originally committed as revision 23435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 22:00:53 +00:00
Stefano Sabatini
ab8f600902 Add support for the newly added Nut codec tags (added in Nut r669): 
Y1[00][16], [16][00]1Y, Y3[11][16], [16][11]3Y, Y3[10][16],
[16][10]3Y, Y3[00][16], [16][00]3Y, Y4[11][ 8], Y2[00][ 8].

Originally committed as revision 23342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-26 22:26:19 +00:00
Stefano Sabatini
6531b5c9f4 Rename ff_raw_pixelFormatTags symbol to ff_raw_pix_fmt_tags. 
The new name is shorter and consistent with the FFmpeg style.

Originally committed as revision 23206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-20 23:09:11 +00:00
Benoit Fouet
f40f329e92 Fix typo ('B', 'O', 'W', '1') => ('B', '0', 'W', '1') 
Originally committed as revision 23150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-17 09:53:59 +00:00
Stefano Sabatini
ed395eb421 Add missing rawvideo pixel formats to codec tags mappings for nut. 
Originally committed as revision 23146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-16 17:08:47 +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
Stefano Sabatini
658e7576fc Reorder nut specific codec tags and add a comment for marking them as 
such.

Also put the [3][0][0][0] codec tag, mapped to rgb565le, in a special
section. It needs to be specified *after* the nut RGB[16] codec tag,
otherwise it will be used by default when encoding normal non-flipped
rgb565le, and will be decoded like a flipped format (see
rawdec.c:raw_init_decoder()).

Originally committed as revision 23075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 23:04:06 +00:00
Stefano Sabatini
43451ec247 Add missing nut-specific codec tags for rawvideo pixel formats. 
Add codec tags for the formats:
[15]BGR Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian [NOT in AVI]
[15]RGB Packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian [NOT in AVI]
[16]BGR Packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian [NOT in AVI]
[16]RGB Packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian [NOT in AVI]
RGBA    Packed RGBA 8:8:8:8, 32bpp, RGBA [NOT in AVI]
BGRA    Packed RGBA 8:8:8:8, 32bpp, BGRA [NOT in AVI]
ABGR    Packed RGBA 8:8:8:8, 32bpp, ABGR [NOT in AVI]
ARGB    Packed RGBA 8:8:8:8, 32bpp, ARGB [NOT in AVI]
RGB[24] Packed RGB 8:8:8, 24bpp RGB [NOT in AVI]
BGR[24] Packed RGB 8:8:8, 24bpp BGR [NOT in AVI]

which are listed in the nut4cc.txt spec.

Originally committed as revision 23074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 23:04:03 +00:00
Stefano Sabatini
934edecdb8 Make the codec tags for the yuvjXXX pixel formats the same as the 
corresponding ones for the yuvXXX pixel formats.

Originally committed as revision 23073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 23:04:01 +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
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Stefano Sabatini
e574770633 Change ff_raw_pixelFormatTags RGB entries (RGB555, BGR555, RGB565, 
BGR565, RGB565) to make them specify the tags for the LE variants
rather than for the native endian ones.

Fix NUT compatibility.

Originally committed as revision 22866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-12 22:05:18 +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
ami_stuff
a4be782cbd Support 2Vuy in mov, fixes issue 1690. 
Patch by ami_stuff, ami_stuff o2 pl

Originally committed as revision 21230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 00:32:09 +00:00
Carl Eugen Hoyos
59ea69ef54 Support decoding of Avid uncompressed mov files, fixes issue 1685. 
Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-15 11:03:40 +00:00
Carl Eugen Hoyos
a0ae3e41f3 Support decoding Avid 1:1x codec, (partially) fixes issue1684. 
Originally committed as revision 21222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-15 10:55:31 +00:00
Carl Eugen Hoyos
c78dfcdaf4 Do not assign codec_tag to pix_fmt in rawdec.c, but in raw.c 
Originally committed as revision 21218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-15 00:45:47 +00:00
Andrew Wason
42022e0362 add yuvs fourcc to raw.c and isom.c, fixes samples/mov/yuvs.mov 
patch by Andrew Wason

Originally committed as revision 20439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-03 16:17:21 +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
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
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
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
Jai Menon
3dd2f87e61 Map MOV fourcc YUV2 correctly to PIX_FMT_YUYV422. 
Patch by Jai Menon

Originally committed as revision 18316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 12:15:04 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +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
Baptiste Coudurier
02a5ef5329 partial WRAW fourcc support, might need image flipping 
Originally committed as revision 16000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-04 02:59:11 +00:00
Carl Eugen Hoyos
95240bf3e3 Fix some icc warnings by using enum PixelFormat instead of int where appropriate. 
Originally committed as revision 15611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-13 07:42:11 +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