videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-06 16:10:09 +02:00
Code Releases Activity
36,566 Commits 36 Branches 398 Tags 240 MiB
fc5a905a6d
Commit Graph

36566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
7e5cbb3c2d cljrdec: improve scaling somewhat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 22:05:24 +01:00
Michael Niedermayer
8f5216905f v410dec: Check for sufficient input data. Fixes crash 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-28 12:47:36 -08:00
Michael Niedermayer
92e2b59dec indeo5: fix division by 0 in ff_ivi_init_tiles() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 21:31:00 +01:00
Michael Niedermayer
a1ca45317d cljrenc: fix scaling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 21:30:26 +01:00
Reimar Döffinger
733b23c2e4 fate: Add v210 codec regression tests 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:50:41 +01:00
Jindřich Makovička
891ce00c8d mpegts: adjustable minimum PES payload 
With the current default PES packet size, and very small audio bitrates,
audio packet duration gets too long. For players, which wait for a whole
audio packet (or more) it takes a very long time to start playing sound.

For 24kbps audio, one PES packet is about 1 second long. On Motorola STBs,
we observe about 3 second delay before the playback starts with the
default setting.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:31:54 +01:00
Jindřich Makovička
6fa9843b4b mpegts: properly output large audio packets 
Do not assume the audio packets being always smaller than
DEFAULT_PES_PAYLOAD_SIZE.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:31:15 +01:00
Paul B Mahol
b5aecc6bc0 avformat: Add SMJPEG demuxer. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:17:20 +01:00
Michael Niedermayer
d46bc4133c indeo5: Fix crash due to partially initialized gop vars. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 20:13:00 +01:00
Michael Niedermayer
4b35ee0b7c indeo5: fix null pointer crash with ref_mb 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 19:55:42 +01:00
Michael Niedermayer
8e09482e4d vcr1dec: Check that there is sufficient input data. 
Fixes crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 19:05:16 +01:00
Michael Niedermayer
11ca3416f9 v410dec: Check for sufficient input data. 
Fixes crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 18:33:29 +01:00
Kostya Shishkov
adfe0c942e Indeo 4 decoder 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2011-12-28 15:22:18 +01:00
Carl Eugen Hoyos
190a0998c3 Fix a crash when reading gray pam files. 
Fixes ticket #837.
 2011-12-28 05:59:39 +01:00
Carl Eugen Hoyos
c1bc1967f3 Fix a typo that broke writing (and reading) PAM files. 
Reported and reviewed by Derek Buitenhuis.
 2011-12-28 05:54:59 +01:00
Michael Niedermayer
0e5fbbd776 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo_enc: K&R cosmetics
  doxygen: remove unreplaced variables from custom header and footer
  threads: test for sys/param.h and include it for sysctl on OpenBSD
  v4l2: remove unneded linux specific asm/types.h include
  x86: Fix constraints for decode_significance*_x86

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-28 02:38:33 +01:00
Frank Vernaillen
ad1c502557 Fixed crash in palette handling when converting certain .png images to .pcx or .bmp. 
The existing code expected a palette buffer holding 256 uint32_t's allocated in the data[1] field of the AVFrame structure, but data[1] was NULL. The bug is fixed by using a fixed local array (palette256) to hold the palette instead.

This solves http://ffmpeg.org/trac/ffmpeg/ticket/833

Signed-off-by: Frank Vernaillen <fr_ve@hotmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-27 23:51:02 +01:00
Michael Niedermayer
29c1b258ab Makefile: fix path to ffprobe.xsd 
Idea-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-27 22:29:40 +01:00
Aneesh Dogra
bd96be6e27 mpegvideo_enc: K&R cosmetics 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-27 10:20:20 -08:00
Carl Eugen Hoyos
ec0dc7e2e0 Make Interplay palette opaque and increase its dynamics. 2011-12-27 18:26:31 +01:00
Carl Eugen Hoyos
387d86077f Support decoding yuv442 and yuv421 jpeg images. 
Fixes ticket #787.
 2011-12-27 18:21:38 +01:00
Carl Eugen Hoyos
613cbf3168 Fix some 1bit png samples, they can be palettised. 
Fixes ticket #767.
 2011-12-27 18:17:57 +01:00
Janne Grunau
2702ec2ef4 doxygen: remove unreplaced variables from custom header and footer 2011-12-27 17:54:06 +01:00
Janne Grunau
06bb590558 threads: test for sys/param.h and include it for sysctl on OpenBSD 2011-12-27 16:09:41 +01:00
Janne Grunau
1adba23cec v4l2: remove unneded linux specific asm/types.h include 2011-12-27 16:07:58 +01:00