apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-28 01:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
62,304 Commits 7 Branches 0 Tags
acf112ba6e3df4132d2b0fc18d3ce8a40badff52
Commit Graph

111 Commits

Author SHA1 Message Date
Michael Niedermayer 787be6d074 Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89' 
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
  LucasArts SMUSH VIMA audio decoder

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

This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav

See: b18357326c and others

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:14:23 +02:00
Michael Niedermayer 881f4e8d34 Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2' 
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
  LucasArts SMUSH SANM video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/sanm.c
	libavcodec/version.h

See: 69254f4628 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 22:19:16 +02:00
Paul B Mahol 6f273093e5 LucasArts SMUSH VIMA audio decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-06 16:41:39 +02:00
Paul B Mahol a420ccd4f2 LucasArts SMUSH SANM video decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-06 16:40:27 +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 95582b5ccc Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b' 
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
  OpenEXR decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/exr.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-01 03:16:56 +02:00
Paul B Mahol ca36aa9e6b codec_desc: set lossless attribute for SGI and DPX 2014-04-01 01:13:17 +02:00
Jimmy Christensen 38389058c3 OpenEXR decoder 
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-01 01:13:09 +02:00
Michael Niedermayer 16ddc58bd7 Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033' 
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
  PAF demuxer and decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/paf.c
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/paf.c
	libavformat/version.h

See: 7de4a16508, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 04:32:05 +01:00
Paul B Mahol 70daeacd6e PAF demuxer and decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-27 23:34:47 +01:00
Michael Niedermayer f392949f1a Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f' 
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
  BRender PIX image decoder

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h

See: 492a5f835c, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 21:09:17 +01:00
Aleksi Nurmi ae17878fb2 BRender PIX image decoder 
Further enhancements by Vittorio Giovara and Paul B Mahol.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-27 18:27:23 +01:00
Michael Niedermayer 12ab07be44 Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' 
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 01:10:28 +01:00
Vittorio Giovara e50f5d3cf9 Alias PIX image encoder and decoder 2014-03-26 23:25:02 +01:00
Peter Ross 89f2f5dbd7 On2 VP7 decoder 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 13:29:05 +01:00
Michael Niedermayer b361a0bf1f Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c' 
* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
  codec_desc: update dvaudio tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 14:53:05 +01:00
Vittorio Giovara f7518f1a0e codec_desc: update dvaudio tag 2014-03-16 23:05:48 +01:00
Michael Niedermayer a8a84fa8b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  codec_desc: group image codecs together

Conflicts:
	libavcodec/codec_desc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 19:36:46 +01:00
Michael Niedermayer 4d10b93bd1 Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43' 
* commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43':
  codec_desc: add missing .long_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 19:24:09 +01:00
Michael Niedermayer 11e66d20d5 Merge commit '999d31d354f1f0616a09691913659ac0abdcc899' 
* commit '999d31d354f1f0616a09691913659ac0abdcc899':
  codec_desc: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 19:16:04 +01:00
Vittorio Giovara f20977921b codec_desc: group image codecs together 2014-03-14 17:50:35 +01:00
Vittorio Giovara d42ea06798 codec_desc: add missing .long_name 2014-03-14 17:50:35 +01:00
Vittorio Giovara 999d31d354 codec_desc: K&R formatting cosmetics 2014-03-14 17:50:34 +01:00
Michael Niedermayer 0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00
Kostya Shishkov cde7df25ef Mirillis FIC video decoder 
Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-08 15:04:13 +00:00
Anssi Hannula 4a4437c0fb avformat/mpegts: demux timed ID3 metadata 
Used in some HLS streams ("Timed Metadata for HTTP Live Streaming").

This is just ID3 tags at arbitrary stream positions, but I still added
"timed" to the codec name to avoid confusion with regular non-stream ID3
tags.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
 2013-12-31 03:13:12 +02:00
Michael Niedermayer 5231eecdaf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 03:26:35 +01:00
Diego Biurrun 19e30a58fc Deprecate obsolete XvMC hardware decoding support 
XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden.
 2013-11-13 21:07:45 +01:00
Michael Niedermayer 5eb1704d5f Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942' 
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
  Add HEVC decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/hevc.c
	libavcodec/hevc.h
	libavcodec/hevc_cabac.c
	libavcodec/hevc_filter.c
	libavcodec/hevc_mvs.c
	libavcodec/hevc_parser.c
	libavcodec/hevc_ps.c
	libavcodec/hevc_refs.c
	libavcodec/hevc_sei.c
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp_template.c
	libavcodec/hevcpred.c
	libavcodec/hevcpred_template.c
	libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:13:00 +01:00
Michael Niedermayer a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:46:39 +01:00
Guillaume Martres 064698d381 Add HEVC decoder 
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun <diego@biurrun.de>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:19:59 +01:00
David Kment 9af7a8523a HNM4/HNM4A demuxer & video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-31 17:45:46 +01:00
Carl Eugen Hoyos 10c240a085 avcodec: Add little-endian G726 decoder 
Fixes part of Ticket1955
suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-18 16:46:08 +02:00
Michael Niedermayer 87fe0bbd69 lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility 
Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-13 00:26:27 +02:00
Paul B Mahol ee3d03bf4e avcodec/dpx: make .long_name more descriptive 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-06 20:17:10 +00:00
Paul B Mahol 7e52080cb1 pcm: support 24-bit/32-bit little-endian planar 
Used by LXF.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-09-27 01:33:45 +02:00
Michael Niedermayer b26ccf218d Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
  Add a WebP decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/img2.c

The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 12:36:11 +02:00
Justin Ruggles c4bfa09807 Add a WebP decoder 
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
 2013-09-18 14:10:05 -04:00
Dirk Farin 902a5fa722 avformat: H265 demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 19:34:04 +02:00
Michael Niedermayer 4cfe3b7405 Merge commit '7df9e693a34c84c698da60426c78140c950f95ed' 
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 15:05:18 +02:00
Diego Biurrun 7df9e693a3 cosmetics: Fix ATRAC codec name spelling 2013-09-02 21:38:57 +02:00
Michael Niedermayer e4eab2d9bd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 12:14:39 +02:00
Kostya Shishkov f544c58636 deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead 
Voxware is the name of company, it has produced several audio codecs e.g.
MetaVoice family and MetaSound.
 2013-08-07 10:56:18 +02:00
Alexis Ballier c3ca70204b codec_desc: fix typo in rv20 long_name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:27:34 +02:00
Michael Niedermayer e5cdf9c03b Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c' 
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
  Go2Webinar decoder

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:47:26 +02:00
Kostya Shishkov 2d66a58ccd Go2Webinar decoder 2013-06-03 09:24:55 +02:00
Paul B Mahol d683271753 lavc/codec_desc: SMPTE 302M is not lossy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 20:26:19 +00:00
Ash Hughes 14ec9d2590 Support playing SMV files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-22 15:20:22 +02:00
Eli Friedman 350914fc80 Escape 130 (RPL) decoder 
Some fixes provided by Paul B Mahol <onemda@gmail.com>
and Michael Niedermayer <michaelni@gmx.at> and me.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2013-05-18 07:12:56 +02:00
Michael Niedermayer 5bc892cb17 Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9' 
* commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9':
  Apple Intermediate Codec decoder
  movenc: Don't add base_data_offset in tfhd for PIFF files

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-17 10:38:08 +02:00