virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
36,291 Commits 37 Branches 400 Tags 464 MiB
7ee0649f95
Commit Graph

36291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Eugen Hoyos
7ee0649f95 Fix decoding some 1bpp tiff files, they are palettized. 
Fixes ticket #830.
 2011-12-31 02:00:33 +01:00
Carl Eugen Hoyos
e767968c6e Simplify tiff decoder by merging two functions. 2011-12-31 01:58:16 +01:00
Carl Eugen Hoyos
b46fb615c4 tiff.c: Use switch / case instead of if / else where appropriate. 2011-12-31 01:53:22 +01:00
Michael Niedermayer
1a6a088f7c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: whitespace cosmetics
  fate: split off video codec FATE tests into their own file
  fate: split off audio codec FATE tests into their own file
  fate: split off Electronic Arts codec FATE tests into their own file
  fate: split off QuickTime codec FATE tests into their own file
  fate: split off voice codec FATE tests into their own file
  fate: split off demuxer FATE tests into their own file
  cosmetics: Drop unnecessary parentheses around return values.
  fate: drop pointless _audio and _video suffixes from xan tests
  qt-faststart: K&R reformatting; fix comment typos
  FATE: Add test for H.264 MP4->annex.B bitstream filter.

Conflicts:
	ffplay.c
	tests/fate.mak
	tests/fate/h264.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/qtrle.mak
	tests/fate/real.mak
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 01:16:45 +01:00
Michael Niedermayer
e146ad95d7 mlp_parser: Fix infinite loop with 0 bytes_left. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 22:32:42 +01:00
Diego Biurrun
9afc025bff fate: whitespace cosmetics 2011-12-30 22:18:17 +01:00
Diego Biurrun
628637f67b fate: split off video codec FATE tests into their own file 2011-12-30 22:18:14 +01:00
Diego Biurrun
ab2d11f75b fate: split off audio codec FATE tests into their own file 2011-12-30 22:18:13 +01:00
Diego Biurrun
394f0b18bf fate: split off Electronic Arts codec FATE tests into their own file 2011-12-30 22:18:12 +01:00
Diego Biurrun
f6ba1f2641 fate: split off QuickTime codec FATE tests into their own file 2011-12-30 22:18:11 +01:00
Diego Biurrun
51150cf070 fate: split off voice codec FATE tests into their own file 2011-12-30 22:18:10 +01:00
Diego Biurrun
c7cb1730da fate: split off demuxer FATE tests into their own file 2011-12-30 22:18:09 +01:00
Diego Biurrun
d4b63054d9 cosmetics: Drop unnecessary parentheses around return values. 2011-12-30 22:18:07 +01:00
Diego Biurrun
f486fb338e fate: drop pointless _audio and _video suffixes from xan tests 2011-12-30 21:14:07 +01:00
Diego Biurrun
cd8d84575b qt-faststart: K&R reformatting; fix comment typos 2011-12-30 21:14:07 +01:00
Michael Niedermayer
bace181b48 flvdec: Add comment about the 5 second threshold 
Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 20:34:55 +01:00
Mike Melanson
ae51b1a9ba FATE: Add test for H.264 MP4->annex.B bitstream filter. 
This test uses an existing FATE sample (h264/interlaced_crop.mp4).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-30 11:20:20 -08:00
Paul B Mahol
ba10207bbe Use more designated initializers. 
Also remove some pointless NULL/0 assigments.

C++ code must be left as it is because named struct
initializers are not supported by C++ standard.
 2011-12-30 20:00:53 +01:00
Paul B Mahol
73ba2c1e62 mp3enc: remove unused variable 2011-12-30 19:42:59 +01:00
Carl Eugen Hoyos
5ff2c49501 Make sure configure does not fail just because unneeded third-party options are used. 2011-12-30 19:20:39 +01:00
Reimar Döffinger
874da652b3 Avoid av_memcpy_backptr hang without extra branch. 
This only happens for a "back" value of 0 which is invalid anyway,
but lcldec does not properly validate input.
Also extend the documentation to specify valid values.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-30 10:37:33 +01:00
Michael Niedermayer
b0143da806 ljpegdec: fix point transform injection. 
Fix Ticket842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 05:12:38 +01:00
Michael Niedermayer
83f70805c0 flvdec: Print a warning in all failure cases of parse_keyframes_index() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 04:29:56 +01:00
Michael Niedermayer
67c734ea5c flvdec: Disable metadatacreator "MEGA" hack 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 04:29:55 +01:00
Michael Niedermayer
df0bff6643 flvdec: Check index for being valid 
Fixes seeking in Enigma_Principles_of_Lust.flv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 04:29:54 +01:00
Michael Niedermayer
00c0465dbc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: split off DPCM codec FATE tests into their own file
  fate: split off PCM codec FATE tests into their own file
  libvorbis: K&R reformatting cosmetics
  libmp3lame: K&R formatting cosmetics
  fate: Add a video test for xxan decoder
  mpegvideo_enc: K&R cosmetics (line 1000-2000).
  avconv: K&R cosmetics
  qt-faststart: Fix up indentation
  indeo4: remove two unused variables
  doxygen: cleanup style to support older doxy
  fate: add more tests for VC-1 decoder
  applehttpproto: Apply the same reload interval changes as for the demuxer
  applehttp: Use half the target duration as interval if the playlist didn't update
  applehttp: Use the last segment duration as reload interval
  lagarith: add decode support for arith rgb24 mode

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 03:46:24 +01:00
Carl Eugen Hoyos
6ed3565f08 Do not fail when decoding invalid v410 files with odd width. 
Reviewed-by; Derek Buitenhuis
 2011-12-30 02:34:29 +01:00
Michael Niedermayer
b9e0e9537a nsvdec: Check av_malloc(string_size) 
This can easily be NULL as string_size can be 2g in a damaged file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 01:44:47 +01:00
Diego Biurrun
209c445267 fate: split off DPCM codec FATE tests into their own file 2011-12-30 01:01:20 +01:00
Diego Biurrun
bdda1616f4 fate: split off PCM codec FATE tests into their own file 2011-12-30 01:01:18 +01:00
Carl Eugen Hoyos
3a15051aba Always assume the bmp palette as being opaque. 2011-12-30 00:48:32 +01:00
Diego Biurrun
ca5ab8cd21 libvorbis: K&R reformatting cosmetics 2011-12-29 23:30:20 +01:00
Aneesh Dogra
c4db344664 libmp3lame: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-29 23:30:20 +01:00
Aneesh Dogra
8ca903ebcb fate: Add a video test for xxan decoder 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-29 13:59:09 -08:00
Aneesh Dogra
9342ecf02e mpegvideo_enc: K&R cosmetics (line 1000-2000). 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-29 13:52:04 -08:00
Aneesh Dogra
7636c8c6a3 avconv: K&R cosmetics 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-29 21:45:44 +01:00
Michael Niedermayer
f41a6c8f3a indeo5: Fix null pointer dereferences of ref_mb 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 21:01:41 +01:00
Michael Niedermayer
7ae251b4d8 h264_mp4toannexb_filter: pass error code through. 
Bug-Found-by and Suggested bugfix: Tanami, Ohad
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 21:01:41 +01:00
Martin Storsjö
cf4afe0be6 qt-faststart: Fix up indentation 
This restores indentation after 65b875d8fc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 19:15:28 +02:00
Kostya Shishkov
1fbd3d30ae indeo4: remove two unused variables 2011-12-29 17:42:31 +01:00
Luca Barbato
762b21f9f7 doxygen: cleanup style to support older doxy 
Doxygen 1.7.5.1 had been used as reference while certain distributions
provide older and not fully compatible versions.
 2011-12-29 17:19:46 +01:00
Nicolas George
377dfa3d99 Revert "build: error on mixed declarations and code" 
This reverts commit 9d6b2077b2.

This error is annoying while debugging, and if someone disables it for
convenience, it raises the odds of leaving ffmpeg unbuildable by default.
 2011-12-29 16:30:19 +01:00
Aneesh Dogra
ac1c27bc2b fate: add more tests for VC-1 decoder 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-29 15:32:31 +01:00
Michael Niedermayer
bf5cc80519 issdemux: Check packet_size for validity 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 15:25:07 +01:00
Michael Niedermayer
e7c1e38ba6 qpeg: Check for overread in qpeg_decode_intra. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 15:21:02 +01:00
Andrey Utkin
1f8bf1ef38 applehttpproto: Apply the same reload interval changes as for the demuxer 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 11:42:55 +02:00
Martin Storsjö
617475a95c applehttp: Use half the target duration as interval if the playlist didn't update 
This is mandated in draft-pantos-http-live-streaming-07, section
6.3.4.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 11:42:45 +02:00
Andrey Utkin
356ae5f65b applehttp: Use the last segment duration as reload interval 
According to draft-pantos-http-live-streaming-07, 6.3.4,
the duration of the last media segment in the playlist
should be used as initial minimum reload delay.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 11:42:21 +02:00
Thad Ward
7af507ea99 lagarith: add decode support for arith rgb24 mode 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-29 07:37:33 +01:00
Michael Niedermayer
6071e4d87a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  v410dec: Check for sufficient input data. Fixes crash
  fate: Add v210 codec regression tests
  mpegts: adjustable minimum PES payload
  mpegts: properly output large audio packets
  avformat: Add SMJPEG demuxer.
  Indeo 4 decoder

Conflicts:
	doc/general.texi
	libavcodec/v410dec.c
	libavcodec/version.h
	libavformat/mpegtsenc.c
	libavformat/smjpeg.c
	libavformat/version.h
	tests/codec-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 01:40:34 +01:00