]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agolavfi: add astreamsync audio filter.
Nicolas George [Wed, 14 Dec 2011 20:33:48 +0000 (21:33 +0100)]
lavfi: add astreamsync audio filter.

12 years agolavf: ffio_limit(), treat avio_size()==0 as error.
Michael Niedermayer [Sat, 31 Dec 2011 14:27:51 +0000 (15:27 +0100)]
lavf: ffio_limit(), treat avio_size()==0 as error.

This works around issues arising from inputs that claim to have a
filesize of 0.

Reported-by: buzz_
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavd/lavfi: fix compiler warning for uninitialized variables
Jean First [Fri, 30 Dec 2011 20:07:59 +0000 (21:07 +0100)]
lavd/lavfi: fix compiler warning for uninitialized variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
12 years agolavfi: port tinterlace filter from MPlayer
Stefano Sabatini [Sat, 25 Jun 2011 11:06:24 +0000 (13:06 +0200)]
lavfi: port tinterlace filter from MPlayer

Port MPlayer tinterlace filter from MPlayer, with some ideas taken
from the FFmbc/libavfilter port, with the following main differences:

* added support for full-scale YUVJ formats
* added support for YUVA420P
* request_frame() on the filter is forced to return a frame
* some code factorization (related to the copy_picture_fields() function)
* fixed black padding values for mode 3

12 years agolavfi: remove redundant definition of avfilter_copy_frame_props() in avfilter.h
Stefano Sabatini [Tue, 27 Dec 2011 14:12:29 +0000 (15:12 +0100)]
lavfi: remove redundant definition of avfilter_copy_frame_props() in avfilter.h

Rationale: avfilter_copy_frame_props() was already defined in
libavfilter/avcodec.h, and keeping the lavc/lavfi API glue localized in a
specific file should ease maintainance and help the ones which use
libavfilter without depending on libavcodec.

12 years agoRevert "aacdec: Avoid unneeded reinit due to ADTS headers"
Michael Niedermayer [Sat, 31 Dec 2011 03:14:27 +0000 (04:14 +0100)]
Revert "aacdec: Avoid unneeded reinit due to ADTS headers"

This has been fixed differently and its revert avoids error messages
when decoding xx.flv. This also reduces the difference to qatar.

This reverts commit 5a2b3f3a52070232a68582a502fb60a9226ca86a.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agotiffdec: hotfix for fate failure.
Michael Niedermayer [Sat, 31 Dec 2011 03:49:33 +0000 (04:49 +0100)]
tiffdec: hotfix for fate failure.

Only use pal8 as output if the file has a palette or more than 2 colors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoflvdec: Check avpriv_mpeg4audio_get_config() return
Michael Niedermayer [Sat, 31 Dec 2011 02:39:22 +0000 (03:39 +0100)]
flvdec: Check avpriv_mpeg4audio_get_config() return

value before using its output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompegts: remove unused variable
Jean First [Fri, 30 Dec 2011 20:08:08 +0000 (21:08 +0100)]
mpegts: remove unused variable

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovenc: remove unused variables
Jean First [Fri, 30 Dec 2011 20:08:05 +0000 (21:08 +0100)]
movenc: remove unused variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocache: use av_freep instead of av_free in cache_open
Jean First [Fri, 30 Dec 2011 20:08:01 +0000 (21:08 +0100)]
cache: use av_freep instead of av_free in cache_open

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocache: remove unused variable in cache_open
Jean First [Fri, 30 Dec 2011 20:08:00 +0000 (21:08 +0100)]
cache: remove unused variable in cache_open

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago8svx: remove unused variable in eightsvx_decode_frame
Jean First [Fri, 30 Dec 2011 20:07:58 +0000 (21:07 +0100)]
8svx: remove unused variable in eightsvx_decode_frame

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix decoding some 1bpp tiff files, they are palettized.
Carl Eugen Hoyos [Sat, 31 Dec 2011 01:00:33 +0000 (02:00 +0100)]
Fix decoding some 1bpp tiff files, they are palettized.

Fixes ticket #830.

12 years agoSimplify tiff decoder by merging two functions.
Carl Eugen Hoyos [Sat, 31 Dec 2011 00:58:16 +0000 (01:58 +0100)]
Simplify tiff decoder by merging two functions.

12 years agotiff.c: Use switch / case instead of if / else where appropriate.
Carl Eugen Hoyos [Sat, 31 Dec 2011 00:53:22 +0000 (01:53 +0100)]
tiff.c: Use switch / case instead of if / else where appropriate.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 31 Dec 2011 00:16:45 +0000 (01:16 +0100)]
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>
12 years agomlp_parser: Fix infinite loop with 0 bytes_left.
Michael Niedermayer [Thu, 29 Dec 2011 20:26:30 +0000 (21:26 +0100)]
mlp_parser: Fix infinite loop with 0 bytes_left.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: whitespace cosmetics
Diego Biurrun [Tue, 27 Dec 2011 16:11:15 +0000 (17:11 +0100)]
fate: whitespace cosmetics

12 years agofate: split off video codec FATE tests into their own file
Diego Biurrun [Tue, 27 Dec 2011 16:00:18 +0000 (17:00 +0100)]
fate: split off video codec FATE tests into their own file

12 years agofate: split off audio codec FATE tests into their own file
Diego Biurrun [Tue, 27 Dec 2011 15:48:56 +0000 (16:48 +0100)]
fate: split off audio codec FATE tests into their own file

12 years agofate: split off Electronic Arts codec FATE tests into their own file
Diego Biurrun [Tue, 27 Dec 2011 13:57:48 +0000 (14:57 +0100)]
fate: split off Electronic Arts codec FATE tests into their own file

12 years agofate: split off QuickTime codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 15:27:12 +0000 (16:27 +0100)]
fate: split off QuickTime codec FATE tests into their own file

12 years agofate: split off voice codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 14:07:55 +0000 (15:07 +0100)]
fate: split off voice codec FATE tests into their own file

12 years agofate: split off demuxer FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 20:47:23 +0000 (21:47 +0100)]
fate: split off demuxer FATE tests into their own file

12 years agocosmetics: Drop unnecessary parentheses around return values.
Diego Biurrun [Thu, 29 Dec 2011 21:23:16 +0000 (22:23 +0100)]
cosmetics: Drop unnecessary parentheses around return values.

12 years agofate: drop pointless _audio and _video suffixes from xan tests
Diego Biurrun [Fri, 30 Dec 2011 17:43:26 +0000 (18:43 +0100)]
fate: drop pointless _audio and _video suffixes from xan tests

12 years agoqt-faststart: K&R reformatting; fix comment typos
Diego Biurrun [Fri, 30 Dec 2011 15:54:52 +0000 (16:54 +0100)]
qt-faststart: K&R reformatting; fix comment typos

12 years agoflvdec: Add comment about the 5 second threshold
Michael Niedermayer [Fri, 30 Dec 2011 19:28:47 +0000 (20:28 +0100)]
flvdec: Add comment about the 5 second threshold

Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFATE: Add test for H.264 MP4->annex.B bitstream filter.
Mike Melanson [Fri, 30 Dec 2011 19:03:37 +0000 (11:03 -0800)]
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>
12 years agoUse more designated initializers.
Paul B Mahol [Fri, 30 Dec 2011 19:00:53 +0000 (20:00 +0100)]
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.

12 years agomp3enc: remove unused variable
Paul B Mahol [Fri, 30 Dec 2011 18:42:59 +0000 (19:42 +0100)]
mp3enc: remove unused variable

12 years agoMake sure configure does not fail just because unneeded third-party options are used.
Carl Eugen Hoyos [Fri, 30 Dec 2011 18:20:39 +0000 (19:20 +0100)]
Make sure configure does not fail just because unneeded third-party options are used.

12 years agoAvoid av_memcpy_backptr hang without extra branch.
Reimar Döffinger [Fri, 30 Dec 2011 09:37:33 +0000 (10:37 +0100)]
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>
12 years agoljpegdec: fix point transform injection.
Michael Niedermayer [Fri, 30 Dec 2011 04:12:38 +0000 (05:12 +0100)]
ljpegdec: fix point transform injection.
Fix Ticket842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoflvdec: Print a warning in all failure cases of parse_keyframes_index()
Michael Niedermayer [Thu, 29 Dec 2011 22:24:10 +0000 (23:24 +0100)]
flvdec: Print a warning in all failure cases of parse_keyframes_index()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoflvdec: Disable metadatacreator "MEGA" hack
Michael Niedermayer [Thu, 29 Dec 2011 22:23:34 +0000 (23:23 +0100)]
flvdec: Disable metadatacreator "MEGA" hack

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoflvdec: Check index for being valid
Michael Niedermayer [Thu, 29 Dec 2011 22:22:41 +0000 (23:22 +0100)]
flvdec: Check index for being valid
Fixes seeking in Enigma_Principles_of_Lust.flv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 30 Dec 2011 02:46:24 +0000 (03:46 +0100)]
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>
12 years agoDo not fail when decoding invalid v410 files with odd width.
Carl Eugen Hoyos [Fri, 30 Dec 2011 01:34:29 +0000 (02:34 +0100)]
Do not fail when decoding invalid v410 files with odd width.

Reviewed-by; Derek Buitenhuis

12 years agonsvdec: Check av_malloc(string_size)
Michael Niedermayer [Thu, 29 Dec 2011 20:31:22 +0000 (21:31 +0100)]
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>
12 years agofate: split off DPCM codec FATE tests into their own file
Diego Biurrun [Thu, 29 Dec 2011 13:03:03 +0000 (14:03 +0100)]
fate: split off DPCM codec FATE tests into their own file

12 years agofate: split off PCM codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 21:10:36 +0000 (22:10 +0100)]
fate: split off PCM codec FATE tests into their own file

12 years agoAlways assume the bmp palette as being opaque.
Carl Eugen Hoyos [Thu, 29 Dec 2011 23:48:32 +0000 (00:48 +0100)]
Always assume the bmp palette as being opaque.

12 years agolibvorbis: K&R reformatting cosmetics
Diego Biurrun [Thu, 29 Dec 2011 20:37:05 +0000 (21:37 +0100)]
libvorbis: K&R reformatting cosmetics

12 years agolibmp3lame: K&R formatting cosmetics
Aneesh Dogra [Thu, 29 Dec 2011 21:19:55 +0000 (02:49 +0530)]
libmp3lame: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years agofate: Add a video test for xxan decoder
Aneesh Dogra [Thu, 29 Dec 2011 18:58:12 +0000 (00:28 +0530)]
fate: Add a video test for xxan decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agompegvideo_enc: K&R cosmetics (line 1000-2000).
Aneesh Dogra [Thu, 29 Dec 2011 18:53:54 +0000 (00:23 +0530)]
mpegvideo_enc: K&R cosmetics (line 1000-2000).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoavconv: K&R cosmetics
Aneesh Dogra [Thu, 29 Dec 2011 20:28:29 +0000 (01:58 +0530)]
avconv: K&R cosmetics

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agoindeo5: Fix null pointer dereferences of ref_mb
Michael Niedermayer [Thu, 29 Dec 2011 01:34:43 +0000 (02:34 +0100)]
indeo5: Fix null pointer dereferences of ref_mb

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264_mp4toannexb_filter: pass error code through.
Michael Niedermayer [Thu, 29 Dec 2011 02:42:15 +0000 (03:42 +0100)]
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>
12 years agoqt-faststart: Fix up indentation
Martin Storsjö [Thu, 29 Dec 2011 16:43:30 +0000 (18:43 +0200)]
qt-faststart: Fix up indentation

This restores indentation after 65b875d8fcc.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoindeo4: remove two unused variables
Kostya Shishkov [Thu, 29 Dec 2011 16:25:26 +0000 (17:25 +0100)]
indeo4: remove two unused variables

12 years agodoxygen: cleanup style to support older doxy
Luca Barbato [Tue, 27 Dec 2011 03:51:39 +0000 (04:51 +0100)]
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.

12 years agoRevert "build: error on mixed declarations and code"
Nicolas George [Thu, 29 Dec 2011 15:30:19 +0000 (16:30 +0100)]
Revert "build: error on mixed declarations and code"

This reverts commit 9d6b2077b27980936efdc616e2f9c92a56b443fc.

This error is annoying while debugging, and if someone disables it for
convenience, it raises the odds of leaving ffmpeg unbuildable by default.

12 years agofate: add more tests for VC-1 decoder
Aneesh Dogra [Thu, 29 Dec 2011 14:29:15 +0000 (15:29 +0100)]
fate: add more tests for VC-1 decoder

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
12 years agoissdemux: Check packet_size for validity
Michael Niedermayer [Thu, 29 Dec 2011 04:05:52 +0000 (05:05 +0100)]
issdemux: Check packet_size for validity

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoqpeg: Check for overread in qpeg_decode_intra.
Michael Niedermayer [Thu, 29 Dec 2011 04:16:34 +0000 (05:16 +0100)]
qpeg: Check for overread in qpeg_decode_intra.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoapplehttpproto: Apply the same reload interval changes as for the demuxer
Andrey Utkin [Wed, 28 Dec 2011 14:55:46 +0000 (16:55 +0200)]
applehttpproto: Apply the same reload interval changes as for the demuxer

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoapplehttp: Use half the target duration as interval if the playlist didn't update
Martin Storsjö [Tue, 27 Dec 2011 11:30:55 +0000 (13:30 +0200)]
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>
12 years agoapplehttp: Use the last segment duration as reload interval
Andrey Utkin [Mon, 26 Dec 2011 19:25:52 +0000 (21:25 +0200)]
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>
12 years agolagarith: add decode support for arith rgb24 mode
Thad Ward [Wed, 28 Dec 2011 05:45:55 +0000 (23:45 -0600)]
lagarith: add decode support for arith rgb24 mode

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 29 Dec 2011 00:40:34 +0000 (01:40 +0100)]
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>
12 years agocljrdec: improve scaling somewhat
Michael Niedermayer [Wed, 28 Dec 2011 20:46:57 +0000 (21:46 +0100)]
cljrdec: improve scaling somewhat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agov410dec: Check for sufficient input data. Fixes crash
Michael Niedermayer [Wed, 28 Dec 2011 20:04:44 +0000 (15:04 -0500)]
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>
12 years agoindeo5: fix division by 0 in ff_ivi_init_tiles()
Michael Niedermayer [Wed, 28 Dec 2011 20:31:00 +0000 (21:31 +0100)]
indeo5: fix division by 0 in ff_ivi_init_tiles()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocljrenc: fix scaling
Michael Niedermayer [Wed, 28 Dec 2011 20:29:03 +0000 (21:29 +0100)]
cljrenc: fix scaling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: Add v210 codec regression tests
Reimar Döffinger [Wed, 28 Dec 2011 01:43:16 +0000 (20:43 -0500)]
fate: Add v210 codec regression tests

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agompegts: adjustable minimum PES payload
Jindřich Makovička [Mon, 19 Dec 2011 19:15:21 +0000 (20:15 +0100)]
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>
12 years agompegts: properly output large audio packets
Jindřich Makovička [Mon, 19 Dec 2011 19:03:24 +0000 (20:03 +0100)]
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>
12 years agoavformat: Add SMJPEG demuxer.
Paul B Mahol [Sat, 24 Dec 2011 01:57:34 +0000 (01:57 +0000)]
avformat: Add SMJPEG demuxer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agoindeo5: Fix crash due to partially initialized gop vars.
Michael Niedermayer [Wed, 28 Dec 2011 19:13:00 +0000 (20:13 +0100)]
indeo5: Fix crash due to partially initialized gop vars.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoindeo5: fix null pointer crash with ref_mb
Michael Niedermayer [Wed, 28 Dec 2011 18:50:29 +0000 (19:50 +0100)]
indeo5: fix null pointer crash with ref_mb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovcr1dec: Check that there is sufficient input data.
Michael Niedermayer [Wed, 28 Dec 2011 18:05:16 +0000 (19:05 +0100)]
vcr1dec: Check that there is sufficient input data.
Fixes crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agov410dec: Check for sufficient input data.
Michael Niedermayer [Wed, 28 Dec 2011 17:33:29 +0000 (18:33 +0100)]
v410dec: Check for sufficient input data.
Fixes crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoIndeo 4 decoder
Kostya Shishkov [Tue, 6 Dec 2011 13:50:32 +0000 (14:50 +0100)]
Indeo 4 decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
12 years agoFix a crash when reading gray pam files.
Carl Eugen Hoyos [Wed, 28 Dec 2011 04:59:39 +0000 (05:59 +0100)]
Fix a crash when reading gray pam files.

Fixes ticket #837.

12 years agoFix a typo that broke writing (and reading) PAM files.
Carl Eugen Hoyos [Wed, 28 Dec 2011 04:54:59 +0000 (05:54 +0100)]
Fix a typo that broke writing (and reading) PAM files.

Reported and reviewed by Derek Buitenhuis.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Dec 2011 23:48:53 +0000 (00:48 +0100)]
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>
12 years agoFixed crash in palette handling when converting certain .png images to .pcx or .bmp.
Frank Vernaillen [Tue, 27 Dec 2011 19:47:49 +0000 (20:47 +0100)]
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>
12 years agoMakefile: fix path to ffprobe.xsd
Michael Niedermayer [Tue, 27 Dec 2011 21:29:40 +0000 (22:29 +0100)]
Makefile: fix path to ffprobe.xsd

Idea-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompegvideo_enc: K&R cosmetics
Aneesh Dogra [Tue, 27 Dec 2011 06:08:07 +0000 (11:38 +0530)]
mpegvideo_enc: K&R cosmetics

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoMake Interplay palette opaque and increase its dynamics.
Carl Eugen Hoyos [Tue, 27 Dec 2011 17:26:31 +0000 (18:26 +0100)]
Make Interplay palette opaque and increase its dynamics.

12 years agoSupport decoding yuv442 and yuv421 jpeg images.
Carl Eugen Hoyos [Tue, 27 Dec 2011 17:21:38 +0000 (18:21 +0100)]
Support decoding yuv442 and yuv421 jpeg images.

Fixes ticket #787.

12 years agoFix some 1bit png samples, they can be palettised.
Carl Eugen Hoyos [Tue, 27 Dec 2011 17:17:57 +0000 (18:17 +0100)]
Fix some 1bit png samples, they can be palettised.

Fixes ticket #767.

12 years agodoxygen: remove unreplaced variables from custom header and footer
Janne Grunau [Tue, 27 Dec 2011 13:33:58 +0000 (14:33 +0100)]
doxygen: remove unreplaced variables from custom header and footer

12 years agothreads: test for sys/param.h and include it for sysctl on OpenBSD
Janne Grunau [Fri, 23 Dec 2011 23:23:55 +0000 (00:23 +0100)]
threads: test for sys/param.h and include it for sysctl on OpenBSD

12 years agov4l2: remove unneded linux specific asm/types.h include
Janne Grunau [Mon, 26 Dec 2011 23:14:41 +0000 (00:14 +0100)]
v4l2: remove unneded linux specific asm/types.h include

12 years agolavfi: add asplit filter
Stefano Sabatini [Sun, 25 Dec 2011 22:04:44 +0000 (23:04 +0100)]
lavfi: add asplit filter

12 years agolavfi: add missing check in avfilter_filter_samples()
Stefano Sabatini [Tue, 27 Dec 2011 14:15:02 +0000 (15:15 +0100)]
lavfi: add missing check in avfilter_filter_samples()

Avoid out-of-buffer data access when nb_channels is 8.

12 years agolavfi: fix avfilter_default_get_audio_buffer() after changes in av_samples_alloc()
Stefano Sabatini [Sun, 25 Dec 2011 22:35:06 +0000 (23:35 +0100)]
lavfi: fix avfilter_default_get_audio_buffer() after changes in av_samples_alloc()

av_samples_alloc() behavior changed in bbb46f3ec, resulting in random
data filling the data[] and linesize[] arrays of the returned
AVFilterBufferRef, which was resulting in wrong behavior in case of code
checking on data[i] nullity.

In particular fixes crash in avfilter_filter_samples():
        for (i = 0; samplesref->data[i]; i++)
            memcpy(link->cur_buf->data[i], samplesref->data[i], samplesref->linesize[0]);

and correctly fills the linesize[] array for planar data.

12 years agolavfi: don't try to indent words in trace messages
Stefano Sabatini [Sun, 25 Dec 2011 12:23:02 +0000 (13:23 +0100)]
lavfi: don't try to indent words in trace messages

The traces end up not indented and ugly anyway, but with the additional
spaces are much more painful to grep/parse.

12 years agoffprobe: add XML writer
Stefano Sabatini [Sat, 8 Oct 2011 22:24:31 +0000 (00:24 +0200)]
ffprobe: add XML writer

12 years agoffprobe: add show_private_data option
Stefano Sabatini [Thu, 22 Dec 2011 09:34:31 +0000 (10:34 +0100)]
ffprobe: add show_private_data option

12 years agoff* tools: move descriptions from copyright header to @file doxy
Stefano Sabatini [Thu, 22 Dec 2011 09:23:22 +0000 (10:23 +0100)]
ff* tools: move descriptions from copyright header to @file doxy

12 years agoChangelog: move thunbnail filter entry from 0.9 to "next" section
Stefano Sabatini [Tue, 27 Dec 2011 11:56:45 +0000 (12:56 +0100)]
Changelog: move thunbnail filter entry from 0.9 to "next" section

12 years agothumbnail: fix error code in case of invalid args.
Clément Bœsch [Tue, 27 Dec 2011 10:15:21 +0000 (11:15 +0100)]
thumbnail: fix error code in case of invalid args.

12 years agolavfi: add thumbnail video filter.
Clément Bœsch [Mon, 24 Oct 2011 15:11:10 +0000 (17:11 +0200)]
lavfi: add thumbnail video filter.

12 years agox86: Fix constraints for decode_significance*_x86
Martin Storsjö [Mon, 26 Dec 2011 19:47:20 +0000 (21:47 +0200)]
x86: Fix constraints for decode_significance*_x86

Originally, prior to 8742a4ff8, the caller code was compiled
within this condition:

ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)

Since HAVE_7REGS is defined as
(ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
the subcondition HAVE_7REGS && HAVE_EBX_AVAILABLE is equal
to HAVE_7REGS (for 32 bit at least). The correct simplification
of the original condition thus is HAVE_7REGS, not
HAVE_EBX_AVAILABLE.

This fixes compilation in some cases where HAVE_EBP_AVAILABLE = 0
and HAVE_EBX_AVAILABLE = 1.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agompegvideo: fix visualization buffer size.
Michael Niedermayer [Tue, 27 Dec 2011 04:53:58 +0000 (05:53 +0100)]
mpegvideo: fix visualization buffer size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>