generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
77,819 Commits 24 Branches 241 Tags 173 MiB
2a31b076b4
Commit Graph

464 Commits

Author SHA1 Message Date
Paul B Mahol
b456ece557 XMA1 and XMA2 stereo decoders 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-11-06 13:45:50 +01:00
Hendrik Leppkes
8b3228a329 Merge commit '533a6198505edd1379e1cd722852350ae4a85acc' 
* commit '533a6198505edd1379e1cd722852350ae4a85acc':
  innoHeim/Rsupport Screen Capture Codec decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-27 13:58:44 +01:00
Vittorio Giovara
533a619850 innoHeim/Rsupport Screen Capture Codec decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-10-23 14:56:43 +02:00
Hendrik Leppkes
4d2160c99a Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa' 
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
  Screenpresso SPV1 decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:22:41 +02:00
Vittorio Giovara
9a3202a98b Screenpresso SPV1 decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-30 16:45:11 +02:00
Thierry Foucu
c5e5e63062 riff: Add support for RV40 codec in AVI 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 14:33:01 +02:00
Thierry Foucu
164cd9b42a libavformat/riff.c: Add support for RV40 codec in AVI 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-15 23:21:47 +02:00
Hendrik Leppkes
80b93f2463 Merge commit '599fe93a840397f551d94db406d0bad42b46b94b' 
* commit '599fe93a840397f551d94db406d0bad42b46b94b':
  riff: Add AVj2 fourcc for Avid jpeg2000

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:28:39 +02:00
Arnaud Bienner
fd6b38bed7 lavf/riff: Support fourcc AVd1 for dvvideo. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2015-09-05 00:09:06 +02:00
Vittorio Giovara
599fe93a84 riff: Add AVj2 fourcc for Avid jpeg2000 2015-09-04 17:51:29 +02:00
Michael Niedermayer
c5fc48fdfb Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0' 
* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
  riff: Add MNM4 FourCC as mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-15 21:18:13 +02:00
Vittorio Giovara
07b2db81d0 riff: Add MNM4 FourCC as mpeg4 2015-06-15 12:29:25 +01:00
Carl Eugen Hoyos
860ac0a5bb lavf/riff: Add 0x729A as TwoCC for G.729. 
Reported by forum user muchuan.
 2015-05-25 23:39:56 +02:00
Michael Niedermayer
2ce2462ba8 Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce' 
* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce':
  riff: Add MultiScope II fourcc MSC2 as MJPEG

See: e31cdb5cc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 12:17:59 +02:00
Carl Eugen Hoyos
da5c6a97bb riff: Add MultiScope II fourcc MSC2 as MJPEG 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-12 03:22:18 +02:00
Carl Eugen Hoyos
e31cdb5cc8 lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG. 2015-05-05 23:52:38 +02:00
Michael Niedermayer
861dec5e90 Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3' 
* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3':
  riff: Add GMP4 fourcc for mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-24 21:17:11 +02:00
Michael Niedermayer
9c56cf09ca Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82' 
* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82':
  riff: Add GLV4 fourcc for mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-24 21:09:03 +02:00
Vittorio Giovara
b17cbb0b1c riff: Add GMP4 fourcc for mpeg4 2015-04-24 14:55:10 +01:00
Vittorio Giovara
3c04ec04df riff: Add GLV4 fourcc for mpeg4 2015-04-24 14:55:10 +01:00
Michael Niedermayer
5a284d076f Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437' 
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:28:13 +02:00
Eric Zimmerman
eb31256f12 g2meet: Support G2M5 codec variant 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:45:35 +01:00
Vittorio Giovara
22526c1f55 Canopus HQ/HQA decoder 
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 22:37:23 +01:00
Paul B Mahol
df7c2b2f1b avformat/riff: support G729A 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-17 19:01:58 +00:00
Michael Niedermayer
e77270cd93 Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d' 
* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
  riff: Add 'M705' FourCC for mpeg2video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-09 20:33:51 +02:00
Vittorio Giovara
783df7d5c5 riff: Add 'M705' FourCC for mpeg2video 2015-04-09 13:52:04 +02:00
Michael Niedermayer
59f687b73c Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995' 
* commit '02d76141d68e38c80f9a205a56b9af10d74f0995':
  riff: Add 'tshd' FourCC for H.264

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 20:48:39 +01:00
Vittorio Giovara
02d76141d6 riff: Add 'tshd' FourCC for H.264 2015-03-17 13:34:22 +00:00
Carl Eugen Hoyos
4326bc364b lavf: Do not list mov-only codecs in riff tags 
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-03-17 13:34:22 +00:00
Michael Niedermayer
e1f37c48e5 Merge commit '247e370e2a913db52ca079b347a174c8d393b171' 
* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:23:01 +01:00
Vittorio Giovara
247e370e2a TDSC decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-03-13 19:48:14 +00:00
Carl Eugen Hoyos
2e0b5f5c90 lavf: Do not list mov-only codecs in riff.c. 
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes a regression similar to the one described in ticket #4307.
 2015-03-13 08:49:03 +01:00
Michael Niedermayer
2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af' 
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 12:19:26 +01:00
Vittorio Giovara
35c6ce76b1 Canopus HQX decoder 
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
 2015-02-22 22:42:27 +00:00
Michael Niedermayer
77ae94727f Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d' 
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
  riff: Support QT RLE Animation in avi ('rle ' FourCC)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:51:39 +01:00
Michael Niedermayer
97bd0e2a93 Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4' 
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
  riff: Support ProRes in avi (APCH fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:42:54 +01:00
Vittorio Giovara
195942ed9b riff: Support QT RLE Animation in avi ('rle ' FourCC) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:18:20 -05:00
Vittorio Giovara
c78dc12118 riff: Support ProRes in avi (APCH fourcc) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:18:20 -05:00
Carl Eugen Hoyos
250e077ee9 riff: Support decoding png in avi (ImageJ) 2014-12-08 13:29:18 +00:00
Michael Niedermayer
720a8d2b75 Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008' 
* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
  riff: support ProRes in avi (APCN fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 01:47:39 +01:00
Vittorio Giovara
4b39cc1a09 riff: support ProRes in avi (APCN fourcc) 2014-11-14 20:24:38 +01:00
Eric Zimmerman
4ba5420e4d Added support for G2M5 codec 
This has also been independently found and fixed similarly by carl in
f4a3bbf4a3cd375121ea2495817f3e50e831ed48
The 2nd magic check is taken from carls implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 19:36:09 +02:00
Michael Niedermayer
a71a5c911e avformat/riff: Add UGY2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-19 14:38:19 +02:00
Carl Eugen Hoyos
3668168afa Support decoding of ImageJ png in avi. 
Fixes ticket #3916.
 2014-09-02 12:02:03 +02:00
Michael Niedermayer
56efd98a65 Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
  On2 AVC decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 20:47:13 +02:00
Kostya Shishkov
e2834567d7 On2 AVC decoder 2014-04-23 19:57:44 +02:00
Vittorio Giovara
b6a09ef700 rawvideo: Support decoding YVYU422 FourCC 2014-04-08 23:24:36 +02:00
Peter Ross
ac4b32df71 On2 VP7 decoder 
Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-04-04 04:00:11 +02:00
Michael Niedermayer
634636eb5a Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  riff: Add an additional AAC TwoCC
  riff: support 0xa100 TwoCC for G723_1
  riff: add 0x594a TwoCC for Xan DPCM
  riff: add 0x64 to g726
  riff: add G723_1 wav tag
  riff: map 0x0038 to amrnb
  riff: Support FLIC FourCC
  riff: add escape130 FourCC
  riff: support 'aas4' FourCC
  riff: add "YUV8" FourCC
  riff: Add "S263" FourCC
  riff: Support XMPG as mpeg1
  riff: support BW10 as mpeg1
  riff: Add SLDV FourCC for dvvideo
  riff: Support NTSC forward dvcpro videos
  riff: add dvis/pdvc FourCCs
  riff: add "GXVE" FourCC for WMV2
  riff: add PLV1 fourcc to mpeg4
  riff: Support decoding ASP variant from QNAP Systems
  riff: add "SM4V" FourCC
  ...

Conflicts:
	libavformat/riff.c

See: various commits, all the merged changes where in ffmpeg already

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 02:54:53 +02:00
Carl Eugen Hoyos
ce58ead40d riff: Add an additional AAC TwoCC 
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
 2014-04-04 01:29:29 +02:00