ffmpeg.git
7 years agodoc/ffprobe: factorize definition of writers syntax
Stefano Sabatini [Fri, 16 Nov 2012 09:25:16 +0000 (10:25 +0100)]
doc/ffprobe: factorize definition of writers syntax

The writers option syntax was unified.

7 years agolibswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
Janne Grunau [Fri, 16 Nov 2012 14:00:49 +0000 (15:00 +0100)]
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR

SWS_CPU_CAPS are deprecated and slated to removed with libswscale major
version 3. No need to provide a SWS_CPU_CAPS_MMX2 as backward
compatibility define under the same explicit condition.

7 years agocpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
Janne Grunau [Fri, 16 Nov 2012 13:55:08 +0000 (14:55 +0100)]
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52

7 years agomxfdec: set audio packets pts
Matthieu Bouron [Thu, 13 Sep 2012 19:15:48 +0000 (21:15 +0200)]
mxfdec: set audio packets pts

Also fix playback of ntsc files.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: add more udta meta data recognition
Xidorn Quan [Thu, 15 Nov 2012 14:40:23 +0000 (22:40 +0800)]
mov: add more udta meta data recognition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mp3enc: make sure the header is valid before writing audio pkt.
Clément Bœsch [Fri, 16 Nov 2012 08:21:17 +0000 (10:21 +0200)]
lavf/mp3enc: make sure the header is valid before writing audio pkt.

An invalid header can lead avpriv_mpegaudio_decode_header() to overread
and/or div by zero.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 16 Nov 2012 12:23:35 +0000 (13:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: port to cpuflags
  crc: av_crc() parameter names should match between .c, .h and doxygen
  avserver: replace av_read_packet with av_read_frame
  avserver: fix constness casting warnings

Conflicts:
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Fix parameters to ff_er_add_slice() call
Janne Grunau [Thu, 15 Nov 2012 15:21:41 +0000 (16:21 +0100)]
h264: Fix parameters to ff_er_add_slice() call

s->mb_x is reset to zero a couple of lines above. It does not make
sense to call ff_er_add_slice() with 0 as endx when the end of the
macroblock row was reached. Fixes unnecessary and counterproductive
error resilience in https://bugzilla.libav.org/show_bug.cgi?id=394.

CC: libav-stable@libav.org
7 years agoh264: always check ref_count for validity
Janne Grunau [Thu, 15 Nov 2012 21:03:58 +0000 (22:03 +0100)]
h264: always check ref_count for validity

Fixes a crash with zuffed files.

7 years agoffserver: put NoDaemon back so as not not break existing conf files.
Michael Niedermayer [Fri, 16 Nov 2012 12:12:09 +0000 (13:12 +0100)]
ffserver: put NoDaemon back so as not not break existing conf files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'
Michael Niedermayer [Fri, 16 Nov 2012 12:07:10 +0000 (13:07 +0100)]
Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

* commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd':
  APIChanges: add entry for av_read_packet deprecation
  mxfdec: fix typo in mxf_read_seek()
  avserver: use freopen to redirect stdin/out/err to /dev/null
  avserver: remove daemon mode
  configure: Check for -Werror parameters on clang
  doxygen: remove obsolete options from Doxyfile
  configure: Add option to disable all command line programs

Conflicts:
Changelog
configure
doc/APIchanges
doc/ffserver.conf
doc/ffserver.texi
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: dsputil: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:45:11 +0000 (15:45 +0200)]
x86: dsputil: port to cpuflags

7 years agocrc: av_crc() parameter names should match between .c, .h and doxygen
Diego Biurrun [Wed, 14 Nov 2012 00:40:25 +0000 (01:40 +0100)]
crc: av_crc() parameter names should match between .c, .h and doxygen

7 years agolavu/opt: fix av_opt_get_key_value() API.
Nicolas George [Sat, 10 Nov 2012 12:03:09 +0000 (13:03 +0100)]
lavu/opt: fix av_opt_get_key_value() API.

Do not skip the end delimiter.
Reserve positive return values.
This is an API break, but the function was introduced less than
two weeks ago.

7 years agodoc/APIchanges: clarify comment on new APIs.
Nicolas George [Sat, 10 Nov 2012 12:14:48 +0000 (13:14 +0100)]
doc/APIchanges: clarify comment on new APIs.

7 years agorv34: check image size before using it
Michael Niedermayer [Fri, 16 Nov 2012 02:46:35 +0000 (03:46 +0100)]
rv34: check image size before using it

fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: do not allow field_mode to change after the first header
Michael Niedermayer [Thu, 15 Nov 2012 23:48:15 +0000 (00:48 +0100)]
vc1dec: do not allow field_mode to change after the first header

Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr/resample: fix SSSE3 included unconditionally.
Clément Bœsch [Thu, 15 Nov 2012 22:52:42 +0000 (23:52 +0100)]
swr/resample: fix SSSE3 included unconditionally.

10l Regression since 8ea88339.

7 years agopp: fix typo in avg() comment.
Clément Bœsch [Sun, 8 Jul 2012 21:09:14 +0000 (23:09 +0200)]
pp: fix typo in avg() comment.

7 years agopp: use av_clip_uint8 instead of a custom implementation.
Clément Bœsch [Fri, 13 Jul 2012 17:05:54 +0000 (19:05 +0200)]
pp: use av_clip_uint8 instead of a custom implementation.

7 years agopp: fix a few typo in the internal header.
Clément Bœsch [Thu, 19 Jul 2012 19:19:20 +0000 (21:19 +0200)]
pp: fix a few typo in the internal header.

7 years agolavfi/geq: fix GPL license header.
Clément Bœsch [Thu, 15 Nov 2012 20:48:36 +0000 (21:48 +0100)]
lavfi/geq: fix GPL license header.

100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.

7 years agoswr/rematrix: move templating parameters to template itself.
Clément Bœsch [Wed, 14 Nov 2012 22:02:12 +0000 (23:02 +0100)]
swr/rematrix: move templating parameters to template itself.

7 years agoswr/resample: move templating parameters to template itself.
Clément Bœsch [Wed, 14 Nov 2012 21:37:30 +0000 (22:37 +0100)]
swr/resample: move templating parameters to template itself.

It has various benefits such as allowing some refactoring, clarifying
the code in the inclusion part, and making the template understandable
in standalone.

This commit is based on the templating method used by Justin Ruggles for
libavresample.

7 years agozmbv: avoid use of uninitialized data
Michael Niedermayer [Thu, 15 Nov 2012 18:15:35 +0000 (19:15 +0100)]
zmbv: avoid use of uninitialized data

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovmdav: more complete check for block_align, prevent out of array access.
Michael Niedermayer [Thu, 15 Nov 2012 16:44:18 +0000 (17:44 +0100)]
vmdav: more complete check for block_align, prevent out of array access.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashsv: only realloc blocks for version 2
Michael Niedermayer [Thu, 15 Nov 2012 19:56:28 +0000 (20:56 +0100)]
flashsv: only realloc blocks for version 2

Fixes 10l regression introducing a memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavserver: replace av_read_packet with av_read_frame
Janne Grunau [Thu, 25 Oct 2012 14:19:16 +0000 (16:19 +0200)]
avserver: replace av_read_packet with av_read_frame

7 years agoavserver: fix constness casting warnings
Janne Grunau [Thu, 25 Oct 2012 13:55:05 +0000 (15:55 +0200)]
avserver: fix constness casting warnings

Use a different char* for extracting info string from the URL. The
other pointer can be made const then which elimates the need for a
cast and fixes the following warnings:
warning: to be safe all intermediate pointers in cast from ‘char **’ to
‘const char **’ must be ‘const’ qualified [-Wcast-qual]

7 years agoAPIChanges: add entry for av_read_packet deprecation
Janne Grunau [Thu, 25 Oct 2012 14:26:06 +0000 (16:26 +0200)]
APIChanges: add entry for av_read_packet deprecation

7 years agomxfdec: fix typo in mxf_read_seek()
Janne Grunau [Fri, 26 Oct 2012 18:01:43 +0000 (20:01 +0200)]
mxfdec: fix typo in mxf_read_seek()

Check the number of index tables before using byte offset based seeking
instead of the index_tables pointer.

Found by Måns Rullgård <mans@mansr.com>.

7 years agoavserver: use freopen to redirect stdin/out/err to /dev/null
Janne Grunau [Thu, 25 Oct 2012 12:54:48 +0000 (14:54 +0200)]
avserver: use freopen to redirect stdin/out/err to /dev/null

7 years agoavserver: remove daemon mode
Mans Rullgard [Wed, 25 Apr 2012 12:08:54 +0000 (12:08 +0000)]
avserver: remove daemon mode

This code spews a multitude of warnings with glibc (unchecked
return values), some of them possibly warranted.  Furthermore,
the deamonisation is not suitable for use with typical startup
scripts as it does not provide the PID of the daemon in any way.
Users wishing to run avserver as a daemon can still do so using
start-stop-daemon or equivalent tools.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoconfigure: Check for -Werror parameters on clang
Martin Storsjö [Tue, 13 Nov 2012 17:01:51 +0000 (19:01 +0200)]
configure: Check for -Werror parameters on clang

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoxygen: remove obsolete options from Doxyfile
Janne Grunau [Sat, 27 Oct 2012 22:43:12 +0000 (00:43 +0200)]
doxygen: remove obsolete options from Doxyfile

The options USE_INLINE_TREES, SHOW_DIRECTORIES and HTML_ALIGN_MEMBERS
became obsolete with doxygen 1.8.1 (releaded 2012-05-19). The generated
outpu for older doxygen versions should not change since they were set
to the default value.

7 years agopcm: give more descriptive name to codec
Paul B Mahol [Wed, 14 Nov 2012 17:02:41 +0000 (17:02 +0000)]
pcm: give more descriptive name to codec

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopgssubdec: check RLE size before copying. Fix out of array accesses
Michael Niedermayer [Thu, 15 Nov 2012 15:41:28 +0000 (16:41 +0100)]
pgssubdec: check RLE size before copying. Fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashsv: reallocate block array independant of frame type.
Michael Niedermayer [Thu, 15 Nov 2012 15:09:23 +0000 (16:09 +0100)]
flashsv: reallocate block array independant of frame type.

Fixes NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRead QuickTime version 1 audio fields in broken mov files.
Carl Eugen Hoyos [Thu, 15 Nov 2012 13:38:19 +0000 (14:38 +0100)]
Read QuickTime version 1 audio fields in broken mov files.

Matrox XMIO capture boards write files with major brand "JUNK"
and compatible brand "qt  " that contain QuickTime version 1
audio fields.

Fixes ticket #1881.

7 years agoswr: move if() block into the only branch where it can be true.
Michael Niedermayer [Thu, 15 Nov 2012 11:22:16 +0000 (12:22 +0100)]
swr: move if() block into the only branch where it can be true.

This should make the code a tiny tiny bit faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: reorder/redesign operations to avoid integer overflow.
Michael Niedermayer [Thu, 15 Nov 2012 11:20:45 +0000 (12:20 +0100)]
swr: reorder/redesign operations to avoid integer overflow.

This fixes a out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffserver: fix streams and priv_data memleaks when closing a connection.
Clément Bœsch [Tue, 13 Nov 2012 15:32:35 +0000 (17:32 +0200)]
ffserver: fix streams and priv_data memleaks when closing a connection.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 15 Nov 2012 10:31:13 +0000 (11:31 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bgmc: Fix av_malloc checks in ff_bgmc_init()
  rtp: set the payload type as stream id

Conflicts:
libavformat/rtpenc_chain.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
Michael Niedermayer [Thu, 15 Nov 2012 10:12:25 +0000 (11:12 +0100)]
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
  avformat: clarify stream id for muxing
  fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
  ppc: do not pass redundant compiler flags
  avutil: change GET_UTF8 to not use av_log2()
  segment: fix NULL pointer dereference in seg_write_header()

Conflicts:
tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoituh263dec: more complete w/h check.
Michael Niedermayer [Thu, 15 Nov 2012 01:43:38 +0000 (02:43 +0100)]
ituh263dec: more complete w/h check.

Fixes a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv10: always check image size not just in some cases.
Michael Niedermayer [Thu, 15 Nov 2012 01:16:56 +0000 (02:16 +0100)]
rv10: always check image size not just in some cases.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxwma: check bytes_per_sample, fix division by 0.
Michael Niedermayer [Wed, 14 Nov 2012 23:56:33 +0000 (00:56 +0100)]
xwma: check bytes_per_sample, fix division by 0.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: dont try to use the previous frame if there is none.
Michael Niedermayer [Wed, 14 Nov 2012 23:42:49 +0000 (00:42 +0100)]
dxa: dont try to use the previous frame if there is none.

Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobink: check quant_index, fix out of array read
Michael Niedermayer [Wed, 14 Nov 2012 22:24:05 +0000 (23:24 +0100)]
bink: check quant_index, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Add option to disable all command line programs
Diego Biurrun [Sat, 10 Nov 2012 17:10:59 +0000 (18:10 +0100)]
configure: Add option to disable all command line programs

7 years agobgmc: Fix av_malloc checks in ff_bgmc_init()
Xi Wang [Wed, 14 Nov 2012 18:45:24 +0000 (13:45 -0500)]
bgmc: Fix av_malloc checks in ff_bgmc_init()

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agogifdec: check ff_lzw_decode_init() return value, fix out of array reads
Michael Niedermayer [Wed, 14 Nov 2012 21:59:22 +0000 (22:59 +0100)]
gifdec: check ff_lzw_decode_init() return value, fix out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmaprodec: check num_sfb for validity. Fix out of array accesses
Michael Niedermayer [Wed, 14 Nov 2012 20:14:40 +0000 (21:14 +0100)]
wmaprodec: check num_sfb for validity. Fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: clarify stream id for muxing
Luca Barbato [Sat, 10 Nov 2012 15:20:30 +0000 (16:20 +0100)]
avformat: clarify stream id for muxing

7 years agortp: set the payload type as stream id
Luca Barbato [Sun, 11 Nov 2012 19:44:28 +0000 (20:44 +0100)]
rtp: set the payload type as stream id

Support multiple video/audio streams with different format in the
same session.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agovpriv_adx_decode_header: avoid underreading the array.
Michael Niedermayer [Wed, 14 Nov 2012 18:15:32 +0000 (19:15 +0100)]
vpriv_adx_decode_header: avoid underreading the array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: require a minimum of 2x2 for the edge pos. Avoid assertion failure
Michael Niedermayer [Wed, 14 Nov 2012 18:03:07 +0000 (19:03 +0100)]
vc1dec: require a minimum of 2x2 for the edge pos. Avoid assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd missing dependency for avr demuxer
Paul B Mahol [Wed, 14 Nov 2012 18:00:17 +0000 (18:00 +0000)]
Add missing dependency for avr demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovc1dec: check first field slices, fix out of array read.
Michael Niedermayer [Wed, 14 Nov 2012 16:34:37 +0000 (17:34 +0100)]
vc1dec: check first field slices, fix out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
Diego Biurrun [Fri, 19 Oct 2012 23:12:18 +0000 (01:12 +0200)]
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests

7 years agoppc: do not pass redundant compiler flags
Mans Rullgard [Wed, 14 Nov 2012 00:07:13 +0000 (00:07 +0000)]
ppc: do not pass redundant compiler flags

The -mpowerpc64 and -mpowerpc-gfxopt flags are implicitly set by
-mcpu as needed.  Passing them explicitly is redundant and can
conflict with user-supplied flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavutil: change GET_UTF8 to not use av_log2()
Mans Rullgard [Tue, 13 Nov 2012 15:49:39 +0000 (15:49 +0000)]
avutil: change GET_UTF8 to not use av_log2()

This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomov: Dont try to calculate with unknown durations, fix division by 0
Michael Niedermayer [Wed, 14 Nov 2012 13:07:58 +0000 (14:07 +0100)]
mov: Dont try to calculate with unknown durations, fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 14 Nov 2012 11:34:30 +0000 (12:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: mmx2 ---> mmxext in asm constructs

Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c'
Michael Niedermayer [Wed, 14 Nov 2012 11:26:55 +0000 (12:26 +0100)]
Merge commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c'

Not merged, its not broken

* commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c':
  Drop broken and unused CABAC test program.

Conflicts:
libavcodec/Makefile
libavcodec/cabac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove deprecation of avcodec_get_chroma_sub_sample.
Michael Niedermayer [Wed, 14 Nov 2012 10:59:25 +0000 (11:59 +0100)]
Remove deprecation of avcodec_get_chroma_sub_sample.

Add explanations what the difference between the 2 functions are and
when either should be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
Michael Niedermayer [Wed, 14 Nov 2012 10:22:40 +0000 (11:22 +0100)]
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosegment: fix NULL pointer dereference in seg_write_header()
Xi Wang [Wed, 14 Nov 2012 07:52:32 +0000 (02:52 -0500)]
segment: fix NULL pointer dereference in seg_write_header()

Since the pointer `oc' is NULL, oc->oformat->name will cause a null
pointer dereference.  This patch changes it to seg->oformat->name.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoffserver: fix NULL dereference with quoted Stream name.
Clément Bœsch [Wed, 14 Nov 2012 09:03:56 +0000 (11:03 +0200)]
ffserver: fix NULL dereference with quoted Stream name.

7 years agoffserver: prefer av_asprintf over malloc+snprintf for Launch setting.
Clément Bœsch [Wed, 14 Nov 2012 08:36:23 +0000 (10:36 +0200)]
ffserver: prefer av_asprintf over malloc+snprintf for Launch setting.

7 years ago8bps: check index against buffer size before reading line length pointer.
Michael Niedermayer [Wed, 14 Nov 2012 02:33:06 +0000 (03:33 +0100)]
8bps: check index against buffer size before reading line length pointer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overre...
Michael Niedermayer [Wed, 14 Nov 2012 02:17:13 +0000 (03:17 +0100)]
mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overreads from crashing

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaasc: check before reading the first 4 byte, fix overread
Michael Niedermayer [Wed, 14 Nov 2012 02:03:04 +0000 (03:03 +0100)]
aasc: check before reading the first 4 byte, fix overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovmnc: check input size before reading chunk header, fix overread
Michael Niedermayer [Wed, 14 Nov 2012 01:50:59 +0000 (02:50 +0100)]
vmnc: check input size before reading chunk header, fix overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'lippit/master'
Michael Niedermayer [Wed, 14 Nov 2012 01:24:11 +0000 (02:24 +0100)]
Merge remote-tracking branch 'lippit/master'

* lippit/master:
  Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix double ;;
Michael Niedermayer [Wed, 14 Nov 2012 01:06:50 +0000 (02:06 +0100)]
ffmpeg: fix double ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix audio timestamps on stream copy with -ss
Michael Niedermayer [Wed, 14 Nov 2012 00:42:33 +0000 (01:42 +0100)]
ffmpeg: fix audio timestamps on stream copy with -ss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: mmx2 ---> mmxext in asm constructs
Diego Biurrun [Mon, 9 Jul 2012 22:04:18 +0000 (00:04 +0200)]
x86: mmx2 ---> mmxext in asm constructs

7 years agoDrop broken and unused CABAC test program.
Diego Biurrun [Fri, 5 Oct 2012 10:12:52 +0000 (12:12 +0200)]
Drop broken and unused CABAC test program.

7 years agoimc: sanity check scalefactors.
Michael Niedermayer [Tue, 13 Nov 2012 23:01:56 +0000 (00:01 +0100)]
imc: sanity check scalefactors.

This fixes undefined behavior

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolxfdec: fix "no audio stream" check. avoid null ptrs deref
Michael Niedermayer [Tue, 13 Nov 2012 22:03:38 +0000 (23:03 +0100)]
lxfdec: fix "no audio stream" check. avoid null ptrs deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/frei0r: add additional trailing slash in FREI0R_PATH paths
Stefano Sabatini [Mon, 29 Oct 2012 17:44:27 +0000 (18:44 +0100)]
lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths

Allow to accept paths with no ending trailing slash.

Based on a patch by rogerdpack <rogerpack2005@gmail.com>.

7 years agolavfi/frei0r: correctly handle paths longer than 1023 chars
Stefano Sabatini [Mon, 29 Oct 2012 17:33:11 +0000 (18:33 +0100)]
lavfi/frei0r: correctly handle paths longer than 1023 chars

7 years agoav_probe_input_format3: support NULL as buffer. Fixes null ptr deref
Michael Niedermayer [Tue, 13 Nov 2012 21:20:44 +0000 (22:20 +0100)]
av_probe_input_format3: support NULL as buffer. Fixes null ptr deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalac: check channel count more completely, fix out of array read
Michael Niedermayer [Tue, 13 Nov 2012 21:07:39 +0000 (22:07 +0100)]
alac: check channel count more completely, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavrndec: calculate true_height only when used.
Michael Niedermayer [Tue, 13 Nov 2012 21:02:46 +0000 (22:02 +0100)]
avrndec: calculate true_height only when used.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcmdec: consistently use codec_id, fixes out of array reads
Michael Niedermayer [Tue, 13 Nov 2012 20:43:37 +0000 (21:43 +0100)]
pcmdec: consistently use codec_id, fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: prevent freeing ones own section in pat_cb
Michael Niedermayer [Tue, 13 Nov 2012 18:48:03 +0000 (19:48 +0100)]
mpegts: prevent freeing ones own section in pat_cb

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: check stps correctly, avoid overreading 1 element.
Michael Niedermayer [Tue, 13 Nov 2012 18:41:55 +0000 (19:41 +0100)]
mov: check stps correctly, avoid overreading 1 element.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvdec: check ipcm more completely, avoid assert failure.
Michael Niedermayer [Tue, 13 Nov 2012 18:37:47 +0000 (19:37 +0100)]
dvdec: check ipcm more completely, avoid assert failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/wtvenc: fix s[tp]_pairs memleak.
Clément Bœsch [Sun, 11 Nov 2012 22:55:25 +0000 (23:55 +0100)]
lavf/wtvenc: fix s[tp]_pairs memleak.

7 years agoUpdate iec61883 to handle multiple devices, and allow
Georg Lippitsch [Thu, 12 Jul 2012 21:36:05 +0000 (23:36 +0200)]
Update iec61883 to handle multiple devices, and allow
selection of DV device by its GUID

7 years agompeg4video_parser: init static tables before use, fix nulll ptr deref
Michael Niedermayer [Tue, 13 Nov 2012 18:21:29 +0000 (19:21 +0100)]
mpeg4video_parser: init static tables before use, fix nulll ptr deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: split static decoder table init out
Michael Niedermayer [Tue, 13 Nov 2012 18:20:59 +0000 (19:20 +0100)]
mpeg4videodec: split static decoder table init out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: h264_weight_10bit: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:44:39 +0000 (15:44 +0200)]
x86: h264_weight_10bit: port to cpuflags

7 years agorv10: consider B frames in low delay streams invalid.
Michael Niedermayer [Tue, 13 Nov 2012 16:59:18 +0000 (17:59 +0100)]
rv10: consider B frames in low delay streams invalid.

Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibtheoraenc: add missing pixdesc.h header
Luca Barbato [Tue, 13 Nov 2012 16:42:13 +0000 (17:42 +0100)]
libtheoraenc: add missing pixdesc.h header

Was left out from c1a02e884ac785033baab356a5437adf057a4189.

7 years agodcadec: check layout & channel count for consistency.
Michael Niedermayer [Tue, 13 Nov 2012 16:33:03 +0000 (17:33 +0100)]
dcadec: check layout & channel count for consistency.

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: remove ff_is_hwaccel_pix_fmt
Luca Barbato [Mon, 12 Nov 2012 00:25:44 +0000 (01:25 +0100)]
avcodec: remove ff_is_hwaccel_pix_fmt

It is used only in one place and is unlikely it would be needed
elsewhere.

7 years agopixdesc: add av_pix_fmt_get_chroma_sub_sample
Luca Barbato [Mon, 12 Nov 2012 00:25:43 +0000 (01:25 +0100)]
pixdesc: add av_pix_fmt_get_chroma_sub_sample

Deprecate avcodec_get_chroma_sub_sample.