apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-01 04:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
60,397 Commits 6 Branches 0 Tags
a18f11158216c22f4a69e44f8cbb59b300a7f10c
Commit Graph

378 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
bf9a8d183d Support writing E-AC3 in wav. 2014-01-29 00:48:50 +01:00
Carl Eugen Hoyos
862174ec83 Move GUID-related objects to riffenc.c and riff.c. 
This simplifies the following eac3-in-wav patch.
 2014-01-29 00:44:59 +01:00
Michael Niedermayer
ee27b11306 avformat/riff: fix demuxing of h264 INMC 
Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 17:58:36 +01:00
Compn
ef7f751642 riff: add DYM4 mpeg4 fourcc 2013-11-19 14:24:25 -05:00
Compn
5592d1b741 riff: add G264 to mpeg4, only decodes keyframes 2013-11-15 09:46:35 -05:00
James Zern
eb7f7b797f riff: add VP9 fourcc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 12:13:44 +01:00
Carl Eugen Hoyos
f7ed044eea Support H.264 fourcc UMSV. 
Fixes ticket #3046.
 2013-10-14 16:29:58 +02:00
Michael Niedermayer
23c8a3353b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  riff: Add a mapping for VP6A

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 14:03:54 +02:00
Martin Storsjö
a52b5a5a07 riff: Add a mapping for VP6A 
This allows demuxing VP6A from F4V files.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-12 13:02:45 +03:00
Carl Eugen Hoyos
a12ab37d1f lavf/riff.c: Fix GeoVision H.264 fourcc. 
Fixes d24da748
 2013-10-11 16:23:09 +02:00
Carl Eugen Hoyos
d24da748c3 Add H.264 fourcc GAVC for GeoVision cameras. 2013-10-11 10:02:00 +02:00
Compn
9ea3598085 riff: g723_1 decodes vivo g723.1 in asf 
works on bellair_digital_movie.asf
 2013-09-15 22:03:03 -04:00
Piotr Bandurski
5cfa51929f avformat/riff: add 0x594a TwoCC 
sample:

http://samples.mplayerhq.hu/game-formats/wc4-xan/crusader-no-regret.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 12:44:26 +02:00
Compn
8d14596bc2 riff: add 0x64 to g726 works on g726-test1.wav 2013-09-03 08:25:43 -04:00
Piotr Bandurski
165b65771d avformat/riff: add DM4V FourCC 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 15:46:25 +02:00
Compn
8e0b6d82b3 riff: add msn audio comment 2013-08-13 09:41:28 -04:00
Piotr Bandurski
e87fcaa8d5 avformat/riff: treat msn audio like gsm_ms 
Fixes decoding of 4 files from Ticket2854

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 11:37:44 +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
Michael Niedermayer
0a8f5eb23a Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b' 
* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:30:47 +02:00
Michael Niedermayer
508a5349da Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472' 
* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472':
  riff: Move muxing code to a separate file

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:08:30 +02:00
Diego Biurrun
255d9c570e riff: Move demuxing code to a separate file. 2013-08-06 11:02:36 +02:00
Diego Biurrun
3dd5c95dee riff: Move muxing code to a separate file 2013-08-06 11:02:35 +02:00
James Almer
562fb9c540 lavf/riff: Add ITRK tag 
Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-18 10:55:23 +02:00
Paul B Mahol
d2ce3b3857 riff: remove invalid fourcc 'exr ' 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-04 11:39:58 +00:00
Michael Niedermayer
bbdef61850 Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282' 
* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
  avf: move riff tags accessors where they belong

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:52:08 +02:00
Luca Barbato
508998f7d5 avf: move riff tags accessors where they belong 2013-06-16 14:41:07 +02:00
Stephen Hutchinson
8ed6c13fe3 libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 10:12:15 +02:00
Yusuke Nakamura
2578f1efd6 riff: Support ULH0 and ULH2 fourccs. 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2013-06-10 09:37:53 +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
Michael Niedermayer
645d0384e8 Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5' 
* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 12:53:58 +02:00
Michael Niedermayer
05deb05fe9 Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de' 
* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
  riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 12:36:29 +02:00
Michael Niedermayer
52e40155a8 Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba' 
* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
  riff: Move guid structs and helper functions into riff

Conflicts:
	libavformat/asf.h
	libavformat/riff.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 12:20:04 +02:00
Michael Niedermayer
369e5dcfc5 Merge commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0' 
* commit '8e329dba378cef0ff6400c7df9c51da167d5a1f0':
  riff: check for eof if chunk size and code are 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 11:46:22 +02:00
Michael Niedermayer
e381cc3e4e Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026' 
* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
  riff: K&R formatting cosmetics

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 10:50:05 +02:00
Luca Barbato
b845f5e97b riff: Factor out WAVEFORMATEX parsing 
Makes the code simpler to follow.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Peter Ross
a3bf80a5ae riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Peter Ross
e544782623 riff: Move guid structs and helper functions into riff 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Luca Barbato
8e329dba37 riff: check for eof if chunk size and code are 0 
Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Peter Ross
516089d5d8 riff: Add ACTRAC3+ guid 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Luca Barbato
1c88617b94 riff: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:12 +02:00
Michael Niedermayer
47335126c0 ff_end_tag: assert that the start is aligned. 
If its start is not aligned then aligning its end will
likely break many demuxers as they check the size and not
the position.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-08 12:51:52 +01:00
Paul B Mahol
810cd0dd9c riff: chunks must be at 2 byte boundary 
Fixes #2244.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-08 10:40:41 +00:00
Michael Niedermayer
a8343bfb6a riff: fix infinite loop 
Fixes Ticket2241

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 18:31:27 +01:00
Michael Niedermayer
17596198ca Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-18 13:36:39 +01:00
Luca Barbato
80ac87c13d lavc: support ZenoXVID custom tag 
Looks like this kind of samples are produced by certain Russian
equipment.
 2013-01-17 21:41:18 +01:00
Carl Eugen Hoyos
9ff92cf195 012v decoder. 
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
 2013-01-06 17:59:27 +01:00
Diego Biurrun
a0c5917f86 Drop Snow codec 
Snow is a toy codec with no real-world use and horrible code.
 2013-01-06 16:30:02 +01:00
Paul B Mahol
92f630eaf2 add forgotten AV_ prefix to some CODEC_IDs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-09 01:47:58 +00:00