virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
52,679 Commits 37 Branches 400 Tags 460 MiB
1ba4cbf734
Commit Graph

347 Commits

Author SHA1 Message Date
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
Carl Eugen Hoyos
196920060b Add FourCC V264 for H264 in CCTV recordings. 2012-12-02 00:43:39 +01:00
Michael Niedermayer
d7b20bfbb5 Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66' 
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:00:44 +01:00
Michael Niedermayer
076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 13:45:57 +01:00
Justin Ruggles
5c7bf2ddde lavf: move nuv fourcc audio tags from riff to nuv 2012-11-28 11:18:50 -05:00
Justin Ruggles
261e9348ef lavf: add a common function for selecting a pcm codec from parameters 2012-11-28 11:18:50 -05:00
Justin Ruggles
cdaa1f84fb lavf: move "MP3 " fourcc from riff to nut 
Original commit, 7b24f9b, says it was added because it is used in libnut.
 2012-11-28 11:18:49 -05:00
Michael Niedermayer
577b39aea2 Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8' 
* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: add missing new line to log message
  dcadec: skip QMF on unused channels
  wavenc: write fact chunk sample count at the correct file position
  riff: do not add empty metadata tags in INFO chunk

Conflicts:
	libavcodec/dcadec.c
	libavcodec/h264.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:31:04 +01:00
Michael Niedermayer
b4d4e51027 Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
	configure
	libavformat/riff.c
	libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:10:05 +01:00
Justin Ruggles
3c370f5abc riff: only warn on a bad INFO chunk code size instead of failing 
fixes Bug 392
 2012-11-26 19:08:51 -05:00
Justin Ruggles
259d8c5647 riff: do not add empty metadata tags in INFO chunk 2012-11-26 19:08:51 -05:00
Michael Niedermayer
bf2f93cdbf Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' 
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:43:45 +01:00
Diego Biurrun
ddb009425c riff: Make ff_riff_tags static and move under appropriate #ifdef 
The table is not used outside the file.
 2012-11-25 13:32:10 +01:00
Paul B Mahol
3d8e684f05 ADPCM IMA Dialogic decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:56:47 +00:00
Piotr Bandurski
6d6bf250dd riff: fix decoding of 24-bit packed int (type 1, 20-bit) 2012-11-24 10:54:38 +01:00
Piotr Bandurski
cc5c2ef09d riff: add SMV2 FourCC for H264 
sample:

http://samples.mplayerhq.hu/V-codecs/smv2.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:16:14 +01:00
Piotr Bandurski
49c2f2d57e riff: add GXVE FourCC for WMV2 
sample:

http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 01:58:51 +01:00
Piotr Bandurski
461797f6aa riff: add "lsvm" FourCC for H263. 2012-11-05 17:43:01 +01:00
Carl Eugen Hoyos
96fac764fa Add an additional AAC TwoCC. 
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
Originally committed to vlc by Jean-Baptiste.
 2012-10-28 14:50:11 +01:00
Piotr Bandurski
2ef26b5e73 riff: support 0xa100 TwoCC 
fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856
(0xa100 = Comverse Infosys Ltd. G723 1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 21:41:59 +02:00
Michael Niedermayer
e4ef2e073c riff_has_valid_tags: remove unused variable 
Fixes CID739471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 22:34:01 +02:00
Michael Niedermayer
81ff0c24ef Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
  configure: fix libcdio check
  rtsp: Allow setting the reordering buffer size via an AVOption
  rtsp: Vertically align a constant definition
  rtp: Update the check for distinguishing between RTP and RTCP
  aac: fix build with hardcoded tables
  fate: dependencies for screen codec tests
  riff: Move functions around to be covered by appropriate #ifdefs

Conflicts:
	configure
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 13:58:14 +02:00
Diego Biurrun
7b2121e7e2 riff: Move functions around to be covered by appropriate #ifdefs 
This fixes compilation with --disable-muxers.
 2012-10-18 16:12:45 +02:00
Michael Niedermayer
d0c27e88d2 riff: retry reading metadata without padding if it fails with 
Fixes Ticket1821

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 16:03:16 +02:00
Michael Niedermayer
1350dffdc6 riff: dont discard truncated metadata 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-18 16:02:50 +02:00
Michael Niedermayer
c079da5073 Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd' 
* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
	tests/ref/fate/vsynth1-cljr
	tests/ref/fate/vsynth1-ffvhuff
	tests/ref/fate/vsynth1-h261
	tests/ref/fate/vsynth1-h263
	tests/ref/fate/vsynth1-h263-obmc
	tests/ref/fate/vsynth1-h263p
	tests/ref/fate/vsynth1-huffyuv
	tests/ref/fate/vsynth1-jpegls
	tests/ref/fate/vsynth1-mjpeg
	tests/ref/fate/vsynth1-mpeg4-adap
	tests/ref/fate/vsynth1-mpeg4-adv
	tests/ref/fate/vsynth1-mpeg4-error
	tests/ref/fate/vsynth1-mpeg4-nr
	tests/ref/fate/vsynth1-mpeg4-qpel
	tests/ref/fate/vsynth1-mpeg4-qprd
	tests/ref/fate/vsynth1-mpeg4-rc
	tests/ref/fate/vsynth1-mpeg4-thread
	tests/ref/fate/vsynth1-msmpeg4
	tests/ref/fate/vsynth1-msmpeg4v2
	tests/ref/fate/vsynth1-rgb
	tests/ref/fate/vsynth1-wmv1
	tests/ref/fate/vsynth1-wmv2
	tests/ref/fate/vsynth1-yuv
	tests/ref/fate/vsynth2-cljr
	tests/ref/fate/vsynth2-ffvhuff
	tests/ref/fate/vsynth2-h261
	tests/ref/fate/vsynth2-h263
	tests/ref/fate/vsynth2-h263-obmc
	tests/ref/fate/vsynth2-h263p
	tests/ref/fate/vsynth2-huffyuv
	tests/ref/fate/vsynth2-jpegls
	tests/ref/fate/vsynth2-mjpeg
	tests/ref/fate/vsynth2-mpeg4-adap
	tests/ref/fate/vsynth2-mpeg4-error
	tests/ref/fate/vsynth2-mpeg4-nr
	tests/ref/fate/vsynth2-mpeg4-qpel
	tests/ref/fate/vsynth2-mpeg4-qprd
	tests/ref/fate/vsynth2-mpeg4-rc
	tests/ref/fate/vsynth2-mpeg4-thread
	tests/ref/fate/vsynth2-msmpeg4
	tests/ref/fate/vsynth2-msmpeg4v2
	tests/ref/fate/vsynth2-rgb
	tests/ref/fate/vsynth2-wmv1
	tests/ref/fate/vsynth2-wmv2
	tests/ref/fate/vsynth2-yuv
	tests/ref/lavf/avi
	tests/ref/seek/h261_avi
	tests/ref/seek/h263_avi
	tests/ref/seek/h263p_avi
	tests/ref/seek/lavf_avi
	tests/ref/seek/mjpeg_avi
	tests/ref/seek/mpeg4_adap_avi
	tests/ref/seek/mpeg4_error_avi
	tests/ref/seek/mpeg4_nr_avi
	tests/ref/seek/mpeg4_qpel_avi
	tests/ref/seek/mpeg4_qprd_avi
	tests/ref/seek/mpeg4_rc_avi
	tests/ref/seek/mpeg4_thread_avi
	tests/ref/seek/msmpeg4_avi
	tests/ref/seek/msmpeg4v2_avi
	tests/ref/seek/wmv1_avi
	tests/ref/seek/wmv2_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:43:26 +02:00
Michael Niedermayer
fadfbb354b Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
	ffmpeg_opt.c
	libavformat/riff.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:30:25 +02:00
Michael Niedermayer
340305646a riff: fix division by zero for G726 
Fixes CID717752
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 19:56:05 +02:00
Victor Vasiliev
0bca0283cc riff: do not write empty INFO tags 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:51:16 +02:00
Victor Vasiliev
71e92414bf lavf: move RIFF INFO tag writing from avienc to riff 
It will be useful in the wav muxer.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:50:36 +02:00
rogerdpack
641c0eea0b bitmap header lookup: add code comment 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-23 02:12:34 +02:00
Derek Buitenhuis
1c56cdad33 riff: Add SVQ3 fourcc 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-14 14:12:52 -04:00