ffmpeg.git
7 years agoff_h264_direct_ref_list_init: fix B slice check.
Michael Niedermayer [Sun, 18 Nov 2012 17:46:05 +0000 (18:46 +0100)]
ff_h264_direct_ref_list_init: fix B slice check.

Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegenc: yuvj444p support
Paul B Mahol [Wed, 7 Nov 2012 21:44:27 +0000 (21:44 +0000)]
mjpegenc: yuvj444p support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/frei0r: in init() check path loop, free resources in a single point
Stefano Sabatini [Fri, 16 Nov 2012 09:58:37 +0000 (10:58 +0100)]
lavfi/frei0r: in init() check path loop, free resources in a single point

7 years agolavfi/frei0r: extend load_path() to support arbitrarily long paths
Stefano Sabatini [Fri, 16 Nov 2012 09:45:25 +0000 (10:45 +0100)]
lavfi/frei0r: extend load_path() to support arbitrarily long paths

7 years agoh264: correct ref count check and limit, fix out of array accesses.
Michael Niedermayer [Sun, 18 Nov 2012 15:29:04 +0000 (16:29 +0100)]
h264: correct ref count check and limit, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix integer overflow, assert failure
Michael Niedermayer [Sun, 18 Nov 2012 14:23:54 +0000 (15:23 +0100)]
h264: fix integer overflow, assert failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_mpeg_update_thread_context: assert context unequality
Michael Niedermayer [Sun, 18 Nov 2012 01:56:29 +0000 (02:56 +0100)]
ff_mpeg_update_thread_context: assert context unequality

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopp: add SSE2 deInterlaceInterpolateCubic().
Clément Bœsch [Sat, 17 Nov 2012 10:03:45 +0000 (11:03 +0100)]
pp: add SSE2 deInterlaceInterpolateCubic().

2124 decicycles in deInterlaceInterpolateCubic_C, 67100774 runs, 8090 skips
458 decicycles in deInterlaceInterpolateCubic_MMX2, 67107146 runs, 1718 skips
382 decicycles in deInterlaceInterpolateCubic_SSE2, 67107086 runs, 1778 skips

7 years agopp: add support for SSE2.
Clément Bœsch [Fri, 16 Nov 2012 23:09:01 +0000 (00:09 +0100)]
pp: add support for SSE2.

7 years agolavfi/mp/pp: use PP_CPU_CAPS_AUTO.
Clément Bœsch [Sun, 18 Nov 2012 14:12:37 +0000 (15:12 +0100)]
lavfi/mp/pp: use PP_CPU_CAPS_AUTO.

7 years agopp: add auto detection cpu flag.
Clément Bœsch [Wed, 14 Nov 2012 22:21:56 +0000 (23:21 +0100)]
pp: add auto detection cpu flag.

7 years agopp: add various const for pointers.
Clément Bœsch [Fri, 16 Nov 2012 22:43:50 +0000 (23:43 +0100)]
pp: add various const for pointers.

7 years agolavfi/drawtext: implement more generic expansion.
Nicolas George [Sat, 10 Nov 2012 18:46:37 +0000 (19:46 +0100)]
lavfi/drawtext: implement more generic expansion.

The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.

7 years agoiff: decode HAM8 images with masking correctly.
Piotr Bandurski [Sun, 18 Nov 2012 14:48:22 +0000 (15:48 +0100)]
iff: decode HAM8 images with masking correctly.

Fixes ticket #967.

Reviewed-by: Peter Ross
7 years agoh264: Skip odd NALs in extradata, prevent undefined behavior
Michael Niedermayer [Sun, 18 Nov 2012 13:23:06 +0000 (14:23 +0100)]
h264: Skip odd NALs in extradata, prevent undefined behavior

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: let av_find_best_stream use bitrate info if available
Marton Balint [Sun, 18 Nov 2012 12:19:14 +0000 (13:19 +0100)]
lavf: let av_find_best_stream use bitrate info if available

I guess the user expects to see the stream with the highest bitrate, not with
the most frames, this is especially useful for multi bitrate streams.

This patch changes av_find_best_stream to select the stream based on a number
of conditions, the first condition has the highest priority, the last condition
has the lowest:

1) Select the stream with the highest FFMIN(5, codec_info_nb_frames) value
2) Select the stream with the highest bitrate
3) Select the stream with the highest codec_info_nb_frames
4) Select the first stream

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff: process DEEP DLOC chunk to obtain image dimensions
Peter Ross [Sun, 18 Nov 2012 08:02:03 +0000 (19:02 +1100)]
iff: process DEEP DLOC chunk to obtain image dimensions

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff: recognise more DEEP colorspaces
Peter Ross [Sun, 18 Nov 2012 08:01:41 +0000 (19:01 +1100)]
iff: recognise more DEEP colorspaces

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 18 Nov 2012 12:35:11 +0000 (13:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32
  lavr: fix the decision for writing directly to the output buffer
  parisc: work around bug in gcc 4.3 and later

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoast: check bit depth too
Paul B Mahol [Sun, 18 Nov 2012 12:29:05 +0000 (12:29 +0000)]
ast: check bit depth too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoimg2enc: remove dead code
Paul B Mahol [Sun, 18 Nov 2012 12:09:20 +0000 (12:09 +0000)]
img2enc: remove dead code

Nothing in lavc sets extradata for such codec and this is wrong place
for it anyway.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoFix possible NULL-pointer dereference when decoding mov files.
Carl Eugen Hoyos [Sun, 18 Nov 2012 07:52:50 +0000 (08:52 +0100)]
Fix possible NULL-pointer dereference when decoding mov files.

Fixes CID743440, introduced in 850e5c0.

7 years agomjpegdec: reset h/v_count, fix assertion failure.
Michael Niedermayer [Sat, 17 Nov 2012 20:07:39 +0000 (21:07 +0100)]
mjpegdec: reset h/v_count, fix assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32
Ronald S. Bultje [Mon, 29 Oct 2012 20:18:04 +0000 (16:18 -0400)]
x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32

Fixes crashes on Win32 and stack overruns on x86-32 in general.

7 years agolavr: fix the decision for writing directly to the output buffer
Justin Ruggles [Thu, 1 Nov 2012 14:13:51 +0000 (10:13 -0400)]
lavr: fix the decision for writing directly to the output buffer

If there are any samples remaining in the output fifo from previous conversion
calls, we have to output those samples first instead of doing direct output
of the current samples.

7 years agoeamad: return meaningful error codes
Paul B Mahol [Sat, 17 Nov 2012 20:28:52 +0000 (20:28 +0000)]
eamad: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosmush: check audio packet size
Paul B Mahol [Sat, 17 Nov 2012 19:58:54 +0000 (19:58 +0000)]
smush: check audio packet size

Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovcr1: check if dimensions are supported, fix out of array accesses.
Michael Niedermayer [Sat, 17 Nov 2012 19:17:22 +0000 (20:17 +0100)]
vcr1: check if dimensions are supported, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoelectronicarts: check size before reading duration out of a chunk.
Michael Niedermayer [Sat, 17 Nov 2012 18:56:26 +0000 (19:56 +0100)]
electronicarts: check size before reading duration out of a chunk.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAST demuxer
Paul B Mahol [Wed, 14 Nov 2012 17:53:22 +0000 (17:53 +0000)]
AST demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoPCM signed 16-bit big-endian planar decoder
Paul B Mahol [Thu, 15 Nov 2012 16:17:55 +0000 (16:17 +0000)]
PCM signed 16-bit big-endian planar decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolxfdec: remove deplanarization hack
Paul B Mahol [Fri, 16 Nov 2012 15:10:36 +0000 (15:10 +0000)]
lxfdec: remove deplanarization hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoPCM signed 24-bit/32-bit little-endian planar decoder
Paul B Mahol [Fri, 16 Nov 2012 16:00:04 +0000 (16:00 +0000)]
PCM signed 24-bit/32-bit little-endian planar decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/texi2pod: recognize @table @command.
Nicolas George [Sun, 11 Nov 2012 17:44:10 +0000 (18:44 +0100)]
doc/texi2pod: recognize @table @command.

7 years agolavfi/drawtext: use bprint for the expanded text.
Nicolas George [Sat, 10 Nov 2012 15:06:32 +0000 (16:06 +0100)]
lavfi/drawtext: use bprint for the expanded text.

7 years agolavu/bprint: implement av_bprint_strftime().
Nicolas George [Sat, 10 Nov 2012 15:05:53 +0000 (16:05 +0100)]
lavu/bprint: implement av_bprint_strftime().

7 years agoparisc: work around bug in gcc 4.3 and later
Mans Rullgard [Wed, 14 Nov 2012 15:56:46 +0000 (15:56 +0000)]
parisc: work around bug in gcc 4.3 and later

A bug in tail call optimisation in gcc 4.3 and later on parisc causes
numerous tests to fail.  Disabling this optimisation gives a working
build.  See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55023

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoflvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.
Michael Niedermayer [Sat, 17 Nov 2012 17:47:36 +0000 (18:47 +0100)]
flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.

I was unable to find a file that needs this hack, if you have one please
contact us!
Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeamad: fix out of array accesses
Michael Niedermayer [Sat, 17 Nov 2012 15:26:55 +0000 (16:26 +0100)]
eamad: fix out of array accesses

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 [Sat, 17 Nov 2012 12:06:12 +0000 (13:06 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a bink version 'b' test
  FATE: add a bink version 'i' test
  libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'
Michael Niedermayer [Sat, 17 Nov 2012 11:58:00 +0000 (12:58 +0100)]
Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'

* commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e':
  cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
  h264: Fix parameters to ff_er_add_slice() call
  h264: always check ref_count for validity

Conflicts:
libavcodec/h264.c
libavutil/cpu.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: free the report file name.
Nicolas George [Sat, 17 Nov 2012 10:24:01 +0000 (11:24 +0100)]
cmdutils: free the report file name.

Fix coverity issue 743443, which was a harmless leak.

7 years agoconfigure: add --fatal-warnings option.
Nicolas George [Sun, 11 Nov 2012 20:37:50 +0000 (21:37 +0100)]
configure: add --fatal-warnings option.

7 years agoconfigure: warn when en/disabling has no effect.
Nicolas George [Sun, 11 Nov 2012 20:29:27 +0000 (21:29 +0100)]
configure: warn when en/disabling has no effect.

Print a warning for --enable- or --disable-something=pattern
does not match any component.

7 years agolavf/avienc: return proper error codes, and provide some more feedback
Stefano Sabatini [Fri, 16 Nov 2012 11:02:22 +0000 (12:02 +0100)]
lavf/avienc: return proper error codes, and provide some more feedback

7 years agoFATE: add a bink version 'b' test
Anton Khirnov [Thu, 15 Nov 2012 08:56:54 +0000 (09:56 +0100)]
FATE: add a bink version 'b' test

7 years agoFATE: add a bink version 'i' test
Anton Khirnov [Thu, 15 Nov 2012 08:56:54 +0000 (09:56 +0100)]
FATE: add a bink version 'i' test

7 years agoxxan: check ybuf index before use.
Michael Niedermayer [Sat, 17 Nov 2012 03:45:38 +0000 (04:45 +0100)]
xxan: check ybuf index before use.

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocook: check subbands more completely, fix out of array read.
Michael Niedermayer [Sat, 17 Nov 2012 02:42:48 +0000 (03:42 +0100)]
cook: check subbands 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 agoff_mpeg4videodec_static_init: fix return type
Michael Niedermayer [Sat, 17 Nov 2012 01:31:11 +0000 (02:31 +0100)]
ff_mpeg4videodec_static_init: fix return type

Fixes CID743439
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: fix potential integer overflow in mxf_compute_sample_count()
Michael Niedermayer [Sat, 17 Nov 2012 01:20:50 +0000 (02:20 +0100)]
mxfdec: fix potential integer overflow in mxf_compute_sample_count()

Fixes CID743442
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocpu: add a few cpu names as aliases for their cpu flags
Michael Niedermayer [Sat, 17 Nov 2012 01:08:12 +0000 (02:08 +0100)]
cpu: add a few cpu names as aliases for their cpu flags

Help to complete this list is welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocpu: add cmov ro the table, which appears to have been forgotten
Michael Niedermayer [Sat, 17 Nov 2012 01:04:30 +0000 (02:04 +0100)]
cpu: add cmov ro the table, which appears to have been forgotten

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotm2: check for invalid vlcs, fix out of array read
Michael Niedermayer [Sat, 17 Nov 2012 00:09:20 +0000 (01:09 +0100)]
tm2: check for invalid vlcs, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopp: simplify postProcess().
Clément Bœsch [Wed, 14 Nov 2012 20:08:59 +0000 (21:08 +0100)]
pp: simplify postProcess().

7 years agopp: rework the way templating is done.
Clément Bœsch [Wed, 14 Nov 2012 19:20:35 +0000 (20:20 +0100)]
pp: rework the way templating is done.

This refactoring simplifies the usage of the template: define the
profile and include the template is all that is required. It should now
be easier to add more instruction sets.

The HAVE_* flags are changed with TEMPLATE_PP_* setting to avoid messing
them up.

See the top comment in postprocess_template.c for details.

7 years agog723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table.
Michael Niedermayer [Fri, 16 Nov 2012 20:25:40 +0000 (21:25 +0100)]
g723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_emulated_edge_mc: fix integer anomalies, fix out of array reads
Michael Niedermayer [Fri, 16 Nov 2012 19:57:35 +0000 (20:57 +0100)]
ff_emulated_edge_mc: fix integer anomalies, fix out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions
Alexander Strasser [Sat, 3 Nov 2012 16:05:51 +0000 (17:05 +0100)]
dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions

Move the NO_DSHOW_STRSAFE macro definition in front of the dshow.h
system header inclusion.

This excludes the usage of the STRSAFE functions consistently.

Further background on this can be found in the commit message of
revision 05ee0db1 where the #define was initially introduced.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
7 years agoffv1enc: consider 2pass float rounding, fix loop
Michael Niedermayer [Fri, 16 Nov 2012 15:55:48 +0000 (16:55 +0100)]
ffv1enc: consider 2pass float rounding, fix loop

Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: fix a few typos in the frei0r docs
Stefano Sabatini [Fri, 16 Nov 2012 10:22:21 +0000 (11:22 +0100)]
doc/filters: fix a few typos in the frei0r docs

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.