ffmpeg.git
6 years agoMakefile: remove old codec_names.h on distclean
Michael Niedermayer [Fri, 7 Sep 2012 12:58:30 +0000 (14:58 +0200)]
Makefile: remove old codec_names.h on distclean

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogitignore: codec_names.h is no more
Michael Niedermayer [Fri, 7 Sep 2012 12:58:04 +0000 (14:58 +0200)]
gitignore: codec_names.h is no more

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/sdl: decrease debug info notice log level from AV_LOG_INFO to VERBOSE
Stefano Sabatini [Fri, 7 Sep 2012 12:04:04 +0000 (14:04 +0200)]
lavd/sdl: decrease debug info notice log level from AV_LOG_INFO to VERBOSE

Decrease log spam.

6 years agolavd/sdl: remove trailing dot in messages
Stefano Sabatini [Fri, 7 Sep 2012 11:58:31 +0000 (13:58 +0200)]
lavd/sdl: remove trailing dot in messages

This is consistent with the apparently prevailing convention.

6 years agolavf/utils: fix typo in has_codec_parameters
Stefano Sabatini [Fri, 7 Sep 2012 12:27:47 +0000 (14:27 +0200)]
lavf/utils: fix typo in has_codec_parameters

Replace "unspecified sample size" with "unspecified frame size". +10l.

6 years agoimg2dec: Don't leave AVIOContexts open on zero byte files
Tomas Härdin [Fri, 7 Sep 2012 11:28:48 +0000 (13:28 +0200)]
img2dec: Don't leave AVIOContexts open on zero byte files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Sep 2012 11:37:19 +0000 (13:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov_chan: Pass a separate AVIOContext for reading
  af_asyncts: check return value from lavr when flushing.
  mss2: simplify loop in decode_rle()
  mss12: avoid unnecessary division in arith*_get_bit()
  mss2: do not try to read too many palette entries
  mpegvideo: set AVFrame fields to NULL after freeing the base memory
  configure: Set the right cc_e flags for msvc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: factor codec id forcing out
Michael Niedermayer [Fri, 7 Sep 2012 11:16:04 +0000 (13:16 +0200)]
lavf: factor codec id forcing out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add qp_table_size
Michael Niedermayer [Fri, 7 Sep 2012 11:00:47 +0000 (13:00 +0200)]
lavfi: add qp_table_size

This avoid recalculating it and in case w/h changed avoids crashes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofaxcompr: fix out of array read
Michael Niedermayer [Fri, 7 Sep 2012 10:35:41 +0000 (12:35 +0200)]
faxcompr: fix out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE
Stefano Sabatini [Thu, 6 Sep 2012 21:20:10 +0000 (23:20 +0200)]
lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE

AV_LOG_INFO is more geared towards messages to be read by the user, the
statistics shown by libx264 with X264_LOG_INFO are more useful at the
debugging level.

Help reducing the log spam.

6 years agolavd/dshow: use AV_OPT_TYPE_IMAGE_SIZE
Ramiro Polla [Thu, 6 Sep 2012 23:50:06 +0000 (20:50 -0300)]
lavd/dshow: use AV_OPT_TYPE_IMAGE_SIZE

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavd/dshow: support video codec and pixel format selection
Ramiro Polla [Thu, 6 Sep 2012 23:41:19 +0000 (20:41 -0300)]
lavd/dshow: support video codec and pixel format selection

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavu/opt: reindent after last commit
Stefano Sabatini [Fri, 7 Sep 2012 07:39:58 +0000 (09:39 +0200)]
lavu/opt: reindent after last commit

6 years agomov_chan: Pass a separate AVIOContext for reading
Samuel Pitoiset [Thu, 6 Sep 2012 10:46:37 +0000 (12:46 +0200)]
mov_chan: Pass a separate AVIOContext for reading

This fixes crashes when called from rtpdec_qt, where
AVFormatContext->pb is null, a crash present since 3bab7cd128.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaf_asyncts: check return value from lavr when flushing.
Anton Khirnov [Tue, 4 Sep 2012 20:01:38 +0000 (22:01 +0200)]
af_asyncts: check return value from lavr when flushing.

Fixes an infinite loop on flush when avresample_get_delay() still
reports some samples but avresample_convert() doesn't return any data.

6 years agolavfi: 10l fix () placement
Michael Niedermayer [Fri, 7 Sep 2012 04:53:11 +0000 (06:53 +0200)]
lavfi: 10l fix () placement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: factor copy_video_props() out
Michael Niedermayer [Fri, 7 Sep 2012 01:24:55 +0000 (03:24 +0200)]
lavfi: factor copy_video_props() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter: pass QP table through the filter chain
Michael Niedermayer [Wed, 5 Sep 2012 02:41:22 +0000 (04:41 +0200)]
libavfilter: pass QP table through the filter chain

Any volunteers to port the pp and spp filters from libmpcodec?

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/vp6: Disable deblock filtering for Simple Profile
Ben Jackson [Thu, 6 Sep 2012 21:30:39 +0000 (14:30 -0700)]
lavc/vp6: Disable deblock filtering for Simple Profile

In vp6 Advanced Profile, deblock filtering is conditionally enabled in
each frame header.  In Simple Profile it should always be off.  vp6 was
inheriting the wrong default from ff_vp56_init.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd Dolby/DPLII downmix support to libswresample
Michael Niedermayer [Sat, 9 Jun 2012 20:45:49 +0000 (13:45 -0700)]
Add Dolby/DPLII downmix support to libswresample

Based on code by John Stebbins <jstebbins.hb@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: update rematrix coeffs to match AC-3
Michael Niedermayer [Thu, 6 Sep 2012 20:32:39 +0000 (22:32 +0200)]
swr: update rematrix coeffs to match AC-3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: update copyright years
Michael Niedermayer [Thu, 6 Sep 2012 19:23:09 +0000 (21:23 +0200)]
swr: update copyright years

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/raw-test: invert the order of key/value when printing the fourcc->pix_fmt map
Stefano Sabatini [Thu, 6 Sep 2012 14:16:11 +0000 (16:16 +0200)]
lavc/raw-test: invert the order of key/value when printing the fourcc->pix_fmt map

Print
FOURCC: PIX_FMT
rather than
PIX_FMT: FOURCC

This seems more consistent with the help message:
-l                list the pixel format for each fourcc

Remove possibly redundant/confusing comment.

6 years agolavf/flvenc: apply various log fixes/clarifications
Stefano Sabatini [Thu, 6 Sep 2012 13:10:21 +0000 (15:10 +0200)]
lavf/flvenc: apply various log fixes/clarifications

Should improve user feedback in case of errors.

6 years agolavf/flvenc: return meaningful error codes
Stefano Sabatini [Thu, 6 Sep 2012 12:54:57 +0000 (14:54 +0200)]
lavf/flvenc: return meaningful error codes

6 years agomss2: simplify loop in decode_rle()
Alberto Delmás [Mon, 3 Sep 2012 15:32:01 +0000 (17:32 +0200)]
mss2: simplify loop in decode_rle()

It calculates the sum of power of two series, which can be done in one step.

Suggested by Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agomss12: avoid unnecessary division in arith*_get_bit()
Alberto Delmás [Mon, 3 Sep 2012 15:32:01 +0000 (17:32 +0200)]
mss12: avoid unnecessary division in arith*_get_bit()

That division can be replaced with a comparison:
((c->value - c->low) << 1) + 1 >= range

By expanding 'range' definition and simplifying this inequation we obtain
the final expression.

Suggested by Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agomss2: do not try to read too many palette entries
Alberto Delmás [Mon, 3 Sep 2012 15:28:01 +0000 (17:28 +0200)]
mss2: do not try to read too many palette entries

Reported by Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agompegvideo: set AVFrame fields to NULL after freeing the base memory
Janne Grunau [Wed, 5 Sep 2012 18:25:48 +0000 (20:25 +0200)]
mpegvideo: set AVFrame fields to NULL after freeing the base memory

Prevents dangling pointers and makes access after free more obvious.
Setting AVFrame.qscale_table to NULL is required for successfully
allocating a previously freed Picture with ff_alloc_picture().

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Sep 2012 14:22:18 +0000 (16:22 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Allow setting the ld parameter from the config file
  x86: dsputil: Do not redundantly check for CPU caps before calling init funcs
  configure: Disable some warnings in MSVC
  x86: vp56: cmov version of vp56_rac_get_prob requires inline asm
  avopt: fix examples to match the same style about default values as the actual code.
  configure: Add support for MSVC cl.exe/link.exe
  lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.

Conflicts:
libavutil/opt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime."
Michael Niedermayer [Thu, 6 Sep 2012 14:14:34 +0000 (16:14 +0200)]
Revert "lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime."

This reverts commit ba537202801d71711f1ef9306a6248dd2d426fa0.
A better implementation has been commited by the same author to qatar

Conflicts:

configure

Found-by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'
Michael Niedermayer [Thu, 6 Sep 2012 14:05:40 +0000 (16:05 +0200)]
Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'

* commit '0db2d94280e260af5f3ad7993c5a6357462f17c9':
  dsputil: workaround __VA_ARGS__ missing tokenization for MSVC
  configure: add section for libc-specific hacks
  build: disable ranlib on mingw
  parser: Don't use pc as context for av_dlog
  h264: Remove an assert on current_picture_ptr being null

Conflicts:
configure
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Set the right cc_e flags for msvc
Martin Storsjö [Thu, 6 Sep 2012 11:44:07 +0000 (14:44 +0300)]
configure: Set the right cc_e flags for msvc

The default ones work, but outputs the preprocessed file on stdout
(into config.log).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/mp: drop rotate wrapper
Stefano Sabatini [Tue, 4 Sep 2012 09:49:15 +0000 (11:49 +0200)]
lavfi/mp: drop rotate wrapper

The native filter transpose is perfectly equivalent.

6 years agofate: Allow setting the ld parameter from the config file
Martin Storsjö [Wed, 5 Sep 2012 19:57:40 +0000 (22:57 +0300)]
fate: Allow setting the ld parameter from the config file

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: dsputil: Do not redundantly check for CPU caps before calling init funcs
Diego Biurrun [Wed, 5 Sep 2012 14:02:17 +0000 (16:02 +0200)]
x86: dsputil: Do not redundantly check for CPU caps before calling init funcs

The init functions check for CPU capabilities on their own already.

6 years agoeliminate some mingw warnings
rogerdpack [Wed, 5 Sep 2012 22:22:58 +0000 (16:22 -0600)]
eliminate some mingw warnings

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoamrnbdec: silence a warning about unsigned cant be negative
Michael Niedermayer [Wed, 5 Sep 2012 22:41:51 +0000 (00:41 +0200)]
amrnbdec: silence a warning about unsigned cant be negative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/lavfi-regression: name temporary files after $testname in do_lavfi_pixfmts()
Stefano Sabatini [Wed, 5 Sep 2012 23:09:36 +0000 (01:09 +0200)]
tests/lavfi-regression: name temporary files after $testname in do_lavfi_pixfmts()

Fix a failure when running do_lavfi_pixfmts() for the
lavfi-tinterlace_merge and lavfi-tinterlace_pad tests concurrently.

Since they were using the same names for the temporary files, the first
ending test was removing them, and the second test was failing at
removing unexisting files.

6 years agotests: add tinterlace filter tests
Stefano Sabatini [Wed, 5 Sep 2012 09:23:42 +0000 (11:23 +0200)]
tests: add tinterlace filter tests

Only the merge and pad modes are tested.

6 years agotests/lavfi-regressions: support user-specified test name in do_lavfi_pixfmts()
Stefano Sabatini [Wed, 5 Sep 2012 21:45:35 +0000 (23:45 +0200)]
tests/lavfi-regressions: support user-specified test name in do_lavfi_pixfmts()

Make do_lavfi_pixfmts() support an user-specified name for the test.

This allows to specify two pixfmts tests for the same filter, e.g. to
test a filter with different parameters. Useful for the pending
tinterlace tests.

6 years agolavfi/tinterlace: declare source buffers in copy_picture_field() as const
Stefano Sabatini [Wed, 5 Sep 2012 08:37:12 +0000 (10:37 +0200)]
lavfi/tinterlace: declare source buffers in copy_picture_field() as const

Increase performance (slightly).

6 years agolavfi/tinterlace: set inlink->cur to NULL, since it is stored internally
Stefano Sabatini [Tue, 4 Sep 2012 18:36:02 +0000 (20:36 +0200)]
lavfi/tinterlace: set inlink->cur to NULL, since it is stored internally

If not set to NULL, the reference is freed by ff_end_frame(), and later
accessed in end_frame() by the filter code, causing a crash.

6 years agolavu/parseutils: add av_small_strptime()
Stefano Sabatini [Sat, 1 Sep 2012 11:32:43 +0000 (13:32 +0200)]
lavu/parseutils: add av_small_strptime()

Make internal small_strptime() function public, and use it in place of
strptime().
This allows to avoid a dependency on strptime() on systems which do not
support it.

In particular, fix trac ticket #992.

6 years agolavu/parseutils: make small_strptime() return a (non const) char *
Stefano Sabatini [Wed, 5 Sep 2012 21:28:52 +0000 (23:28 +0200)]
lavu/parseutils: make small_strptime() return a (non const) char *

This is consistent with the standard definition of strptime().

6 years agolavf: fix a few typo in some comments.
Clément Bœsch [Wed, 5 Sep 2012 21:22:35 +0000 (23:22 +0200)]
lavf: fix a few typo in some comments.

6 years agolavf: remove a few useless AV_NOWARN_DEPRECATED().
Clément Bœsch [Wed, 5 Sep 2012 21:15:33 +0000 (23:15 +0200)]
lavf: remove a few useless AV_NOWARN_DEPRECATED().

read_seek was undeprecated in e5c708151.

6 years agoconfigure: Disable some warnings in MSVC
Martin Storsjö [Wed, 5 Sep 2012 18:39:20 +0000 (21:39 +0300)]
configure: Disable some warnings in MSVC

This disables the following warnings:
C4100: unreferenced formal parameter
 (1035 occurrances)
C4214: nonstandard extension used : bit field types other than int
 (609 occurances)
C4996: 'avpriv_snprintf': This function or variable may be unsafe.
       Consider using _snprintf_s instead. To disable deprecation,
       use _CRT_SECURE_NO_WARNINGS. See online help for details.
 (351 occurrances)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovf_hue: fix AVOption defaults
Michael Niedermayer [Wed, 5 Sep 2012 20:18:53 +0000 (22:18 +0200)]
vf_hue: fix AVOption defaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoacelp_pitch_delay: add missing libm.h include for exp2()
Michael Niedermayer [Wed, 5 Sep 2012 19:56:41 +0000 (21:56 +0200)]
acelp_pitch_delay: add missing libm.h include for exp2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: vp56: cmov version of vp56_rac_get_prob requires inline asm
Hendrik Leppkes [Wed, 5 Sep 2012 17:43:18 +0000 (19:43 +0200)]
x86: vp56: cmov version of vp56_rac_get_prob requires inline asm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agog723_1: add some const for more correctness
Michael Niedermayer [Wed, 5 Sep 2012 19:03:17 +0000 (21:03 +0200)]
g723_1: add some const for more correctness

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoproresenc_anatoliy: add 2 const to silence 2 warnings
Michael Niedermayer [Wed, 5 Sep 2012 18:54:50 +0000 (20:54 +0200)]
proresenc_anatoliy: add 2 const to silence 2 warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoOptimization of AC3 floating point decoder for MIPS
Nedeljko Babic [Tue, 4 Sep 2012 16:43:34 +0000 (18:43 +0200)]
Optimization of AC3 floating point decoder for MIPS

FFT in MIPS implementation is working iteratively instead
 of "recursively" calling functions for smaller FFT sizes.
Some of DSP and format convert utils functions are also optimized.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavopt: fix examples to match the same style about default values as the actual code.
Michael Niedermayer [Wed, 5 Sep 2012 16:40:21 +0000 (18:40 +0200)]
avopt: fix examples to match the same style about default values as the actual code.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoimgconvert: silence some const incompatible pointer warnings.
Michael Niedermayer [Wed, 5 Sep 2012 16:44:42 +0000 (18:44 +0200)]
imgconvert: silence some const incompatible pointer warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavopt: fix examples to match the same style about default values as the actual code.
Michael Niedermayer [Wed, 5 Sep 2012 16:40:21 +0000 (18:40 +0200)]
avopt: fix examples to match the same style about default values as the actual code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_scale: fix incompatible pointer type warning
Michael Niedermayer [Wed, 5 Sep 2012 16:31:18 +0000 (18:31 +0200)]
vf_scale: fix incompatible pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opt: support NULL and special "none" values for size and pixel format options
Stefano Sabatini [Thu, 9 Aug 2012 20:55:49 +0000 (22:55 +0200)]
lavu/opt: support NULL and special "none" values for size and pixel format options

Allow to specify NULL values explicitly, thus overriding the default
values set in the context.

6 years agoconfigure: Add support for MSVC cl.exe/link.exe
Ronald S. Bultje [Fri, 22 Jun 2012 09:24:59 +0000 (12:24 +0300)]
configure: Add support for MSVC cl.exe/link.exe

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.
Ronald S. Bultje [Tue, 4 Sep 2012 13:30:37 +0000 (14:30 +0100)]
lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodsputil: workaround __VA_ARGS__ missing tokenization for MSVC
Luca Barbato [Wed, 25 Jul 2012 14:22:34 +0000 (16:22 +0200)]
dsputil: workaround __VA_ARGS__ missing tokenization for MSVC

A second expansion forces the preprocessor to tokenize properly.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: add section for libc-specific hacks
Mans Rullgard [Tue, 4 Sep 2012 12:57:37 +0000 (13:57 +0100)]
configure: add section for libc-specific hacks

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobuild: disable ranlib on mingw
Mans Rullgard [Tue, 4 Sep 2012 14:20:45 +0000 (15:20 +0100)]
build: disable ranlib on mingw

Using ranlib is not required but prevents using the libraries with
msvc.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Sep 2012 13:02:17 +0000 (15:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: eamad: Add missing dependency on mpegvideo code
  build: utvideoenc: Add missing dependency on Huffman code
  avopt: Reorder the default_val struct, making i64 the first field

Conflicts:
configure
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoparser: Don't use pc as context for av_dlog
Martin Storsjö [Tue, 4 Sep 2012 11:45:00 +0000 (14:45 +0300)]
parser: Don't use pc as context for av_dlog

The ParserContext class doesn't have an AVClass, required for
using it as a logging class.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '21bc44038491e525335ad763883b0288402ff6a0'
Michael Niedermayer [Wed, 5 Sep 2012 12:52:52 +0000 (14:52 +0200)]
Merge commit '21bc44038491e525335ad763883b0288402ff6a0'

* commit '21bc44038491e525335ad763883b0288402ff6a0':
  avopt: Explicitly store rational option defaults in .dbl

Conflicts:
libavfilter/buffersrc.c
libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'
Michael Niedermayer [Wed, 5 Sep 2012 12:44:05 +0000 (14:44 +0200)]
Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'

* commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a':
  avopt: Explicitly store float/double option defaults in .dbl

Conflicts:
libavcodec/ac3dec.c
libavcodec/libx264.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
Michael Niedermayer [Wed, 5 Sep 2012 12:26:01 +0000 (14:26 +0200)]
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
  avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
Michael Niedermayer [Wed, 5 Sep 2012 12:09:09 +0000 (14:09 +0200)]
Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'

* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
  avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Conflicts:
libavcodec/libvpxenc.c
libavcodec/options_table.h
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '124134e42455763b28cc346fed1d07017a76e84e'
Michael Niedermayer [Wed, 5 Sep 2012 11:58:11 +0000 (13:58 +0200)]
Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

* commit '124134e42455763b28cc346fed1d07017a76e84e':
  avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Conflicts:
libavcodec/aacenc.c
libavcodec/libopenjpegenc.c
libavcodec/options_table.h
libavdevice/bktr.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/vf_drawtext.c
libavformat/movenc.c
libavformat/options_table.h
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906'
Michael Niedermayer [Wed, 5 Sep 2012 11:49:48 +0000 (13:49 +0200)]
Merge commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906'

* commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906':
  svq1enc: Set picture_structure correctly
  mpegvideo: remove last_picture_ptr / h264 assert.
  mpegvideo_enc: remove assert that has become obsolete with the new API
  elbg: Fix an assert

Conflicts:
libavcodec/elbg.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Remove an assert on current_picture_ptr being null
Michael Niedermayer [Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)]
h264: Remove an assert on current_picture_ptr being null

It is possible in various error paths as well as gap handling
that this has already been allocated. It is not clear why that
would be a problem with the current code, thus disable the
assert to avoid a common assert failure when asserts are enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc/filters: add mp=noise example
Stefano Sabatini [Wed, 5 Sep 2012 09:55:16 +0000 (11:55 +0200)]
doc/filters: add mp=noise example

6 years agodoc/filters: itemize example for mp filter
Stefano Sabatini [Wed, 5 Sep 2012 09:53:25 +0000 (11:53 +0200)]
doc/filters: itemize example for mp filter

6 years agobuild: eamad: Add missing dependency on mpegvideo code
Diego Biurrun [Tue, 4 Sep 2012 15:01:06 +0000 (17:01 +0200)]
build: eamad: Add missing dependency on mpegvideo code

6 years agobuild: utvideoenc: Add missing dependency on Huffman code
Diego Biurrun [Tue, 4 Sep 2012 14:57:29 +0000 (16:57 +0200)]
build: utvideoenc: Add missing dependency on Huffman code

6 years agodoc/filters: remove reference to mp=hue filter, which was dropped
Stefano Sabatini [Wed, 5 Sep 2012 09:44:01 +0000 (11:44 +0200)]
doc/filters: remove reference to mp=hue filter, which was dropped

6 years agolavc/dvdsubdec: parse the size from the extradata.
Clément Bœsch [Tue, 4 Sep 2012 15:49:15 +0000 (17:49 +0200)]
lavc/dvdsubdec: parse the size from the extradata.

6 years agoavopt: Reorder the default_val struct, making i64 the first field
Martin Storsjö [Fri, 31 Aug 2012 10:35:47 +0000 (13:35 +0300)]
avopt: Reorder the default_val struct, making i64 the first field

Also mention this change in APIchanges.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavopt: Explicitly store rational option defaults in .dbl
Martin Storsjö [Thu, 30 Aug 2012 21:42:30 +0000 (00:42 +0300)]
avopt: Explicitly store rational option defaults in .dbl

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavopt: Explicitly store float/double option defaults in .dbl
Martin Storsjö [Fri, 31 Aug 2012 10:34:23 +0000 (13:34 +0300)]
avopt: Explicitly store float/double option defaults in .dbl

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Martin Storsjö [Fri, 31 Aug 2012 10:22:31 +0000 (13:22 +0300)]
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Martin Storsjö [Fri, 31 Aug 2012 09:52:18 +0000 (12:52 +0300)]
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member
Martin Storsjö [Fri, 31 Aug 2012 09:45:52 +0000 (12:45 +0300)]
avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agointreadwrite: Dont evaluate value for AV_W* multiple times.
Michael Niedermayer [Tue, 4 Sep 2012 19:26:16 +0000 (21:26 +0200)]
intreadwrite: Dont evaluate value for AV_W* multiple times.

Evaluating it multiple times, can have side effects and is possibly slow.
So its definitly a bad idea.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopaf: avoid using expressions with sideeffects in AV_R*
Michael Niedermayer [Tue, 4 Sep 2012 19:25:39 +0000 (21:25 +0200)]
paf: avoid using expressions with sideeffects in AV_R*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: update sinks used by ffplay/ffmpeg
Michael Niedermayer [Tue, 4 Sep 2012 16:49:58 +0000 (18:49 +0200)]
configure: update sinks used by ffplay/ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/Makefile: add forgotten entries for the ff-sinks
Michael Niedermayer [Tue, 4 Sep 2012 16:49:28 +0000 (18:49 +0200)]
libavfilter/Makefile: add forgotten entries for the ff-sinks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosink_buffer: fix #ifs for FF-sinks
Michael Niedermayer [Tue, 4 Sep 2012 16:49:05 +0000 (18:49 +0200)]
sink_buffer: fix #ifs for FF-sinks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosvq1enc: Set picture_structure correctly
Michael Niedermayer [Mon, 6 Aug 2012 14:28:13 +0000 (16:28 +0200)]
svq1enc: Set picture_structure correctly

This fixes assert failures when running in debug mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompegvideo: remove last_picture_ptr / h264 assert.
Michael Niedermayer [Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)]
mpegvideo: remove last_picture_ptr / h264 assert.

This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompegvideo_enc: remove assert that has become obsolete with the new API
Michael Niedermayer [Mon, 6 Aug 2012 08:26:04 +0000 (10:26 +0200)]
mpegvideo_enc: remove assert that has become obsolete with the new API

It now just checks uninitialized and unused data.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoelbg: Fix an assert
Michael Niedermayer [Sat, 18 Aug 2012 19:53:32 +0000 (21:53 +0200)]
elbg: Fix an assert

It seems the condition was flipped from what was intended.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 4 Sep 2012 15:04:51 +0000 (17:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: add support for bdver1 and bdver2 CPU types.
  avio: make avio_close NULL the freed buffer
  pixdesc: cosmetics
  proresenc: Don't free a buffer not owned by the codec
  proresenc: Write the full value in one put_bits call
  adpcmenc: Calculate the IMA_QT predictor without overflow
  x86: Add convenience macros to check for CPU extensions and flags
  x86: h264dsp: drop some unnecessary ifdefs around prototype declarations
  mss12: merge decode_pixel() and decode_top_left_pixel()
  mss12: reduce SliceContext size from 1067 to 164 KB
  mss12: move SliceContexts out of the common context into the codec contexts

Conflicts:
libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: add support for bdver1 and bdver2 CPU types.
Diego Elio Pettenò [Mon, 3 Sep 2012 12:20:44 +0000 (05:20 -0700)]
configure: add support for bdver1 and bdver2 CPU types.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavio: make avio_close NULL the freed buffer
Luca Barbato [Tue, 4 Sep 2012 13:04:46 +0000 (15:04 +0200)]
avio: make avio_close NULL the freed buffer

6 years agopixdesc: cosmetics
Luca Barbato [Fri, 31 Aug 2012 09:22:20 +0000 (11:22 +0200)]
pixdesc: cosmetics

6 years agoproresenc: Don't free a buffer not owned by the codec
Martin Storsjö [Tue, 4 Sep 2012 11:57:45 +0000 (14:57 +0300)]
proresenc: Don't free a buffer not owned by the codec

The data in coded_frame isn't allocated using get_buffer, but
is copied from the input frame to the encoder, so we should
not try to free it ourselves.

This fixes an assert failure when running in debug mode.

Signed-off-by: Martin Storsjö <martin@martin.st>