generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,166 Commits 24 Branches 241 Tags 173 MiB
3c728ceec6
Commit Graph

14821 Commits

Author SHA1 Message Date
Thilo Borgmann
2f08dad028 lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-05 03:32:06 +02:00
Carl Eugen Hoyos
90d93eeb38 Allow .y as extension for image2. 2014-04-05 02:18:09 +02:00
Carl Eugen Hoyos
9f4ab4e5f9 Show stream number when warning about stream without start time. 2014-04-05 01:15:12 +02:00
Carl Eugen Hoyos
87f2999641 Force gif aspect ratio multiplication to 64bit. 
Avoids a possible integer overflow.
 2014-04-05 01:13:47 +02:00
Michael Niedermayer
849a8c4cdb Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4' 
* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4':
  oggparsevorbis: export replaygain tags from Vorbis comments

Conflicts:
	libavformat/Makefile
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 23:17:33 +02:00
Michael Niedermayer
8e8c8607fc Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202' 
* commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202':
  flacdec: export replaygain tags from Vorbis comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 22:59:28 +02:00
Michael Niedermayer
c1d053621c Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81' 
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
  replaygain: correctly parse peak values

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 22:52:12 +02:00
Michael Niedermayer
6520613139 Merge commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1' 
* commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1':
  replaygain: fix gain sign decoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 22:44:17 +02:00
Alessandro Ghedini
0048deb84c oggparsevorbis: export replaygain tags from Vorbis comments 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-04 17:40:51 +02:00
Alessandro Ghedini
1d55f8d5f6 flacdec: export replaygain tags from Vorbis comments 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-04 17:40:51 +02:00
Alessandro Ghedini
8542f9c4f1 replaygain: correctly parse peak values 
According to the ReplayGain spec, the peak amplitude may overflow and may result
in peak amplitude values greater than 1.0 with psychoacoustically coded audio,
such as MP3. Fully compliant decoders must allow peak overflows.

Additionally, having peak values in the 0<->UINT32_MAX scale makes it more
difficult for applications to actually use the peak values (e.g. when
implementing clipping prevention) since values have to be rescaled down.

This patch corrects the peak parsing by removing the rescaling of the decoded
values between 0 and UINT32_MAX and the 1.0 upper limit.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-04 17:40:19 +02:00
Peter Ross
0cc685e3ad avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 17:20:38 +02:00
Peter Ross
8348bd198f avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalid 
Fixes ticket #3522.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 17:11:47 +02:00
Alessandro Ghedini
25b6837f7c replaygain: fix gain sign decoding 
The gain sign was incorrectly decoded: since the FFSIGN() macro treats 0 as
negative, gain values starting with "0." were always decoded as negative.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-04 17:04:37 +02:00
James Almer
0f62982335 oggenc: check return value of av_mallocz() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 15:56:52 +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
Michael Niedermayer
1946ad4d8c Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4' 
* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
  isom: add some BOXX tags
  isom: add 'flic' tag
  isom: add 'm1v ' tag

Conflicts:
	libavformat/isom.c

See: ca8623e1a5
See: 8a3f976498
See: fca62f0500
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 02:44:56 +02:00
Michael Niedermayer
069e462beb Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b' 
* commit 'ad8f736b7404503d8f5164f4879175a2258dd64b':
  mxf: Remove typo

also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 02:18:32 +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
Piotr Bandurski
1e8c4fb8fc riff: support 0xa100 TwoCC for G723_1 
Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav
 2014-04-04 01:29:29 +02:00
Piotr Bandurski
00ccdcd88c riff: add 0x594a TwoCC for Xan DPCM 
Sample-Id: crusader-no-regret.avi
 2014-04-04 01:29:29 +02:00
Compn
7b600ea0da riff: add 0x64 to g726 
Sample-Id: g726-test1.wav
 2014-04-04 01:29:28 +02:00
Piotr Bandurski
b7a12ab95b riff: add G723_1 wav tag 2014-04-04 01:29:28 +02:00
Compn
10a14bd574 riff: map 0x0038 to amrnb 
Sample-Id: 40709.avi
 2014-04-04 01:29:28 +02:00
Paul B Mahol
228af18a98 riff: Support FLIC FourCC 2014-04-04 01:29:28 +02:00
Michael Niedermayer
fb6c21fa8c riff: add escape130 FourCC 2014-04-04 01:29:27 +02:00
Piotr Bandurski
ae58466994 riff: support 'aas4' FourCC 2014-04-04 01:29:27 +02:00
Piotr Bandurski
7100f3c07d riff: add "YUV8" FourCC 
Sample-Id: MAILTEST.AVI
 2014-04-04 01:29:27 +02:00
Piotr Bandurski
c9787f034c riff: Add "S263" FourCC 2014-04-04 01:29:27 +02:00
Michael Niedermayer
9ff6429b07 riff: Support XMPG as mpeg1 2014-04-04 01:29:26 +02:00
Michael Niedermayer
771cb3e592 riff: support BW10 as mpeg1 2014-04-04 01:29:26 +02:00
Piotr Bandurski
eaec09a575 riff: Add SLDV FourCC for dvvideo 2014-04-04 01:29:25 +02:00
Carl Eugen Hoyos
a1c58b3acd riff: Support NTSC forward dvcpro videos 
PAL looks incorrect.
 2014-04-04 01:29:25 +02:00
Piotr Bandurski
6aa7cbd58c riff: add dvis/pdvc FourCCs 2014-04-04 01:29:24 +02:00
Piotr Bandurski
adf0ff0000 riff: add "GXVE" FourCC for WMV2 
Sample-Id: vivd.avi
 2014-04-04 01:29:24 +02:00
Compn
96dd7b2332 riff: add PLV1 fourcc to mpeg4 
Sample-Id: york-water-meteor.avi
 2014-04-04 01:29:24 +02:00
Carl Eugen Hoyos
f5f18aecef riff: Support decoding ASP variant from QNAP Systems 2014-04-04 01:29:23 +02:00
Piotr Bandurski
ade32b4a84 riff: add "SM4V" FourCC 2014-04-04 01:29:23 +02:00
Compn
684e43c5e3 riff: add DYM4 mpeg4 fourcc 2014-04-04 01:29:23 +02:00
Piotr Bandurski
32b0942c99 riff: add DM4V FourCC 2014-04-04 01:29:23 +02:00
Compn
fa6a021121 riff: add G264 to mpeg4, only decodes keyframes 2014-04-04 01:29:22 +02:00
Piotr Bandurski
9ab2d5a33c riff: add "lsvm" FourCC for H263. 2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos
915524e541 riff: Support H.264 fourcc UMSV 2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos
dcb6e145eb riff: add FourCC for GeoVision cameras 2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos
9d9d319a3c riff: Add V264 for H264 in CCTV recordings 2014-04-04 01:29:21 +02:00
Carl Eugen Hoyos
51ace0fb92 riff: add H264 from QNAP Systems 2014-04-04 01:29:21 +02:00
Piotr Bandurski
a52a1bc912 riff: add SMV2 FourCC for H264 
Sample-Id: smv2.avi
 2014-04-04 01:29:21 +02:00
Clément Bœsch
235bf1dab5 riff: add ISMP/timecode tag 2014-04-04 00:28:28 +02:00
James Almer
fa570a5548 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
 2014-04-04 00:28:28 +02:00