ffmpeg.git
6 years agolavfi/select: make lavc dependency optional.
Clément Bœsch [Fri, 29 Jun 2012 17:13:13 +0000 (19:13 +0200)]
lavfi/select: make lavc dependency optional.

6 years agoMerge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'
Michael Niedermayer [Thu, 20 Sep 2012 11:40:47 +0000 (13:40 +0200)]
Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a':
  matroskadec: return meaningful errors in matroska_decode_buffer
  matroskadec: fix incorrect unsigned->signed conversion

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'
Michael Niedermayer [Thu, 20 Sep 2012 11:30:44 +0000 (13:30 +0200)]
Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'

* commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b':
  matroskadec: refactor matroska_decode_buffer

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix git domain check with out of tree build
jamal [Thu, 20 Sep 2012 10:53:30 +0000 (12:53 +0200)]
configure: fix git domain check with out of tree build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: fix index_tables check in mxf_read_seek()
Michael Niedermayer [Wed, 19 Sep 2012 22:52:26 +0000 (00:52 +0200)]
mxfdec: fix index_tables check in mxf_read_seek()

Approved-by: Tjoppen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests: add fate-ffprobe test
Stefano Sabatini [Mon, 17 Sep 2012 19:08:46 +0000 (21:08 +0200)]
tests: add fate-ffprobe test

6 years agolavd/lavfi: push frames until the last sink is EOF
Stefano Sabatini [Thu, 20 Sep 2012 09:41:11 +0000 (11:41 +0200)]
lavd/lavfi: push frames until the last sink is EOF

Previously the device was returning EOF when the first sink was ending,
with the current change the device will continue to return frames until
all the sinks are EOF, which seems the most expected behavior.

6 years agolavfi/testsrc: increase precision of the duration parameter
Stefano Sabatini [Thu, 20 Sep 2012 08:57:00 +0000 (10:57 +0200)]
lavfi/testsrc: increase precision of the duration parameter

Compute duration in microseconds, rather than in timebase units. Decrease
approximation errors.

6 years agoerror_resilience: guess_dc: check malloc failure
Michael Niedermayer [Thu, 20 Sep 2012 03:38:53 +0000 (05:38 +0200)]
error_resilience: guess_dc: check malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh263dec: disable coded dimensions = 0 handling
Michael Niedermayer [Thu, 20 Sep 2012 02:36:35 +0000 (04:36 +0200)]
h263dec: disable coded dimensions = 0 handling

This code causes infinite loops

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '581281e242609a222233a2e5538b89dfb88fb18e'
Michael Niedermayer [Thu, 20 Sep 2012 01:20:29 +0000 (03:20 +0200)]
Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'

* commit '581281e242609a222233a2e5538b89dfb88fb18e':
  matroskadec: check realloc in lzo encoding
  matroska: honor error_recognition on unknown doctypes
  tiffdec: Add support for GRAY16LE.
  tiffenc: Add support for little endian RGB48 and GRAY16
  mpeg4: support frame parameter changes with frame-mt
  mpegvideo: check ff_find_unused_picture() return value for errors
  mpegvideo: release frame buffers before freeing them
  configure: msvc: default to 'lib' as 'ar' tool
  build: support some non-standard ar variants

Conflicts:
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/tiff.c
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfenc: support 23.976 and 24 frame rates
Matthieu Bouron [Wed, 12 Sep 2012 22:48:40 +0000 (00:48 +0200)]
mxfenc: support 23.976 and 24 frame rates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfenc: factorize samples per frame code
Matthieu Bouron [Wed, 12 Sep 2012 22:48:39 +0000 (00:48 +0200)]
mxfenc: factorize samples per frame code

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: fix "static is not at beginning of declaration" warning
Michael Niedermayer [Thu, 20 Sep 2012 00:13:52 +0000 (02:13 +0200)]
j2k: fix "static is not at beginning of declaration" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Detect old git domain and inform the user about it.
Michael Niedermayer [Sun, 2 Sep 2012 01:15:16 +0000 (03:15 +0200)]
configure: Detect old git domain and inform the user about it.

Based on code by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: fix 32/64 format type
Michael Niedermayer [Wed, 19 Sep 2012 21:36:35 +0000 (23:36 +0200)]
mov: fix 32/64 format type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: fix "set but not used" variable
Michael Niedermayer [Wed, 19 Sep 2012 21:29:37 +0000 (23:29 +0200)]
dcadec: fix "set but not used" variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/filtfmts: fix argv/argc checks
Michael Niedermayer [Wed, 19 Sep 2012 20:25:41 +0000 (22:25 +0200)]
libavfilter/filtfmts: fix argv/argc checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobavfilter/filtfmts: fix type for channel layouts
Michael Niedermayer [Wed, 19 Sep 2012 20:19:06 +0000 (22:19 +0200)]
bavfilter/filtfmts: fix type for channel layouts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_des_init: suppress warning about unused parameter
Michael Niedermayer [Wed, 19 Sep 2012 19:57:58 +0000 (21:57 +0200)]
av_des_init: suppress warning about unused parameter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: return meaningful errors in matroska_decode_buffer
Luca Barbato [Fri, 14 Sep 2012 18:03:37 +0000 (20:03 +0200)]
matroskadec: return meaningful errors in matroska_decode_buffer

6 years agomatroskadec: refactor matroska_decode_buffer
Luca Barbato [Fri, 14 Sep 2012 16:51:49 +0000 (18:51 +0200)]
matroskadec: refactor matroska_decode_buffer

Make MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP behave like
the other encodings and spare few lines of boilerplate code.

6 years agomatroskadec: fix incorrect unsigned->signed conversion
Dale Curtis [Thu, 14 Jun 2012 22:22:25 +0000 (15:22 -0700)]
matroskadec: fix incorrect unsigned->signed conversion

6 years agomatroskadec: check realloc in lzo encoding
Luca Barbato [Fri, 14 Sep 2012 16:39:58 +0000 (18:39 +0200)]
matroskadec: check realloc in lzo encoding

Make all the compression encodings behave the same way.

6 years agomatroska: honor error_recognition on unknown doctypes
Luca Barbato [Thu, 12 Jul 2012 11:38:50 +0000 (13:38 +0200)]
matroska: honor error_recognition on unknown doctypes

6 years agotiffdec: Add support for GRAY16LE.
Alex Converse [Wed, 19 Sep 2012 00:46:48 +0000 (17:46 -0700)]
tiffdec: Add support for GRAY16LE.

Tested with the GraphicsMagick TIFF archive and Libav generated files.

6 years agotiffenc: Add support for little endian RGB48 and GRAY16
Alex Converse [Tue, 18 Sep 2012 23:45:09 +0000 (16:45 -0700)]
tiffenc: Add support for little endian RGB48 and GRAY16

6 years agompeg4: support frame parameter changes with frame-mt
Janne Grunau [Tue, 18 Sep 2012 13:48:14 +0000 (15:48 +0200)]
mpeg4: support frame parameter changes with frame-mt

Adds a flag context_reinit to MpegEncContext to relieable keep track
of frame parameter changes which require a context reinitialization.
This is required for broken inputs which change the frame size but
error out before the context can be reinitialized.

6 years agompegvideo: check ff_find_unused_picture() return value for errors
Janne Grunau [Sat, 8 Sep 2012 13:56:52 +0000 (15:56 +0200)]
mpegvideo: check ff_find_unused_picture() return value for errors

6 years agompegvideo: release frame buffers before freeing them
Janne Grunau [Wed, 19 Sep 2012 17:39:52 +0000 (19:39 +0200)]
mpegvideo: release frame buffers before freeing them

Fixes triggering an assert in avcodec_default_release_buffer()
introduced in 1b3439b30.

6 years agoavutil: Cast AV_NOPTS_VALUE to int64_t explicitly
Andrey Utkin [Wed, 19 Sep 2012 17:42:14 +0000 (19:42 +0200)]
avutil: Cast AV_NOPTS_VALUE to int64_t explicitly

Thus comparsion against int64_t value will not raise warning
(from -Wextra set) about comparsion of unsigned and signed integer

commiter added () and changed the litteral to unsigned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmavoice: initialize best_hist_ptr to NULL to prevent (incorrect) warning.
Michael Niedermayer [Wed, 19 Sep 2012 16:33:30 +0000 (18:33 +0200)]
wmavoice: initialize best_hist_ptr to NULL to prevent (incorrect) warning.

As a sideeffect this makes the code more robust if a future change leaves
a path where it may be uninitialized otherwise.

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

* qatar/master:
  rv34: use ff_MPV_common_frame_size_change()
  mpegvideo: add reinit function for frame parameter changes

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

* commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c':
  mpegvideo: move frame size dependent memory management to separate functions
  configure: add --toolchain option
  configure: Make the smoothstreaming muxer enable the ismv muxer
  smoothstreaming: Export the mp4 codec tags
  mov: check for EOF in long lasting loops
  avcodec: cleanup utils.c
  binkaudio: remove unneeded GET_BITS_SAFE macro
  binkaudio: use float sample format
  binkaudio: use a different value for the coefficient scale for the DCT codec

Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: msvc: default to 'lib' as 'ar' tool
Mans Rullgard [Mon, 17 Sep 2012 23:10:29 +0000 (00:10 +0100)]
configure: msvc: default to 'lib' as 'ar' tool

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agobuild: support some non-standard ar variants
Mans Rullgard [Mon, 17 Sep 2012 22:56:32 +0000 (23:56 +0100)]
build: support some non-standard ar variants

This adds support for the TI and Microsoft (lib.exe) variants of
the ar utility.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodoc/filters: clarify use of graph2dot
Tim Nicholson [Wed, 19 Sep 2012 08:02:01 +0000 (09:02 +0100)]
doc/filters: clarify use of graph2dot

The GRAPH_DESCRIPTION string supplied to graph2dot must include explicitly
defined inputs and outputs which are not normally part of the command line
used in a real invocation.

This clarifies that requirement, and provides an example.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoffprobe: fix CSV writer output
Stefano Sabatini [Wed, 19 Sep 2012 09:23:11 +0000 (11:23 +0200)]
ffprobe: fix CSV writer output

Fix regression introduced in 749ddc14fc9ebcef09965dfd98c8bf2505dc3b58.

6 years agorv34: use ff_MPV_common_frame_size_change()
Janne Grunau [Wed, 5 Sep 2012 18:49:18 +0000 (20:49 +0200)]
rv34: use ff_MPV_common_frame_size_change()

Specialised functionality for size changes with the advantage of
supporting frame size changes during frame-based multithreading.

6 years agompegvideo: add reinit function for frame parameter changes
Janne Grunau [Wed, 5 Sep 2012 18:40:12 +0000 (20:40 +0200)]
mpegvideo: add reinit function for frame parameter changes

This is mainly required for frame parameter changes during frame based
multithreading but single threaded usage profits too from avoiding
ff_MPV_common_end()/ff_MPV_common_init() cycles.

6 years agompegvideo: move frame size dependent memory management to separate functions
Janne Grunau [Wed, 5 Sep 2012 14:34:05 +0000 (16:34 +0200)]
mpegvideo: move frame size dependent memory management to separate functions

This is a preparation for supporting frame size changes during
frame-based multithreading.

6 years agoFix segfault with -filters option
Bobby Bingham [Wed, 19 Sep 2012 04:27:43 +0000 (23:27 -0500)]
Fix segfault with -filters option

Filters now use null pointers to indicate having no input/output pads,
rather than empty lists of pads. We can't assume pad is non-null
anymore.

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
6 years agoffserver: fix typo in log message
Bobby Bingham [Wed, 19 Sep 2012 00:57:12 +0000 (19:57 -0500)]
ffserver: fix typo in log message

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
6 years agoconfigure: add --toolchain option
Mans Rullgard [Sun, 16 Sep 2012 21:06:53 +0000 (22:06 +0100)]
configure: add --toolchain option

This allows creating canned shorthands for common combinations
of cc, ld etc.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoavidec: workaround aac with broken block align
Michael Niedermayer [Tue, 18 Sep 2012 19:47:22 +0000 (21:47 +0200)]
avidec: workaround aac with broken block align

Fixes Ticket1742

Based on patch by: Nikola Vranic <nikola.vranic@rt-rk.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: Add a few common disposition cases
Derek Buitenhuis [Tue, 18 Sep 2012 20:09:46 +0000 (16:09 -0400)]
ffprobe: Add a few common disposition cases

This info is crucial in knowing which stream to pick in an
automated setup.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolavfi/select: make sure avctx is set before closing it.
Clément Bœsch [Tue, 18 Sep 2012 16:49:09 +0000 (18:49 +0200)]
lavfi/select: make sure avctx is set before closing it.

This avoid a crash when the filter fails before config_input(),
typically with a syntax error in the next filter:
    select=gt(scene\,.4),select=fail

6 years agoSilence warning C4554 when compiling with msvc.
Carl Eugen Hoyos [Tue, 18 Sep 2012 16:38:16 +0000 (18:38 +0200)]
Silence warning C4554 when compiling with msvc.

warning C4554: '>>' : check operator precedence for possible error; use parentheses to clarify precedence

Reviewed-by: Derek Buitenhuis
6 years agosonic: factorize tail_size
Michael Niedermayer [Tue, 18 Sep 2012 15:37:41 +0000 (17:37 +0200)]
sonic: factorize tail_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosonicenc: limit quant so that golomb codes are less than 32 bits long
Michael Niedermayer [Tue, 18 Sep 2012 15:33:55 +0000 (17:33 +0200)]
sonicenc: limit quant so that golomb codes are less than 32 bits long

before they could become 33 bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Make the smoothstreaming muxer enable the ismv muxer
Martin Storsjö [Tue, 18 Sep 2012 08:34:16 +0000 (11:34 +0300)]
configure: Make the smoothstreaming muxer enable the ismv muxer

This doesn't fix any build failure, but the smoothstreaming muxer
opens a chained ismv muxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosmoothstreaming: Export the mp4 codec tags
Martin Storsjö [Tue, 18 Sep 2012 08:31:44 +0000 (11:31 +0300)]
smoothstreaming: Export the mp4 codec tags

This fixes stream copy from a format that already has incompatible
codec tags set. The chained ismv muxer exports this same codec tag
list, so set it on this one as well, to allow the caller (and
lavf common code) to set them correctly.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86/mpegaudiodec: drop likely now unneeded #if HAVE_AVX_EXTERNAL
Michael Niedermayer [Tue, 18 Sep 2012 14:15:17 +0000 (16:15 +0200)]
x86/mpegaudiodec: drop likely now unneeded #if HAVE_AVX_EXTERNAL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegaudiodec: add prototypes for all functions that may need them
Michael Niedermayer [Tue, 18 Sep 2012 14:10:09 +0000 (16:10 +0200)]
mpegaudiodec: add prototypes for all functions that may need them

fixes compile failure

Found-by: kriegerod
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoallcodecs: re-enable sonic
Michael Niedermayer [Tue, 18 Sep 2012 13:45:20 +0000 (15:45 +0200)]
allcodecs: re-enable sonic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosonic: update to encode2() API
Michael Niedermayer [Tue, 18 Sep 2012 13:45:07 +0000 (15:45 +0200)]
sonic: update to encode2() API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: check for EOF in long lasting loops
Luca Barbato [Sun, 16 Sep 2012 18:32:12 +0000 (20:32 +0200)]
mov: check for EOF in long lasting loops

A quite widespread pattern in the demuxer is read a 32bit unsigned
integer and then loop till this value is reached.

Checking for EOF prevents pathological situations.

6 years agoavcodec: cleanup utils.c
Luca Barbato [Fri, 14 Sep 2012 17:18:17 +0000 (19:18 +0200)]
avcodec: cleanup utils.c

6 years agobinkaudio: remove unneeded GET_BITS_SAFE macro
Justin Ruggles [Mon, 17 Sep 2012 20:20:36 +0000 (16:20 -0400)]
binkaudio: remove unneeded GET_BITS_SAFE macro

Normal get_bits() already has overread protection.

6 years agobinkaudio: use float sample format
Justin Ruggles [Mon, 27 Aug 2012 00:41:45 +0000 (20:41 -0400)]
binkaudio: use float sample format

Use planar for DCT codec, interleaved for RDFT codec.

6 years agobinkaudio: use a different value for the coefficient scale for the DCT codec
Justin Ruggles [Mon, 17 Sep 2012 20:13:24 +0000 (16:13 -0400)]
binkaudio: use a different value for the coefficient scale for the DCT codec

Eliminates the need for vector_fmul_scalar() in each frame.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 18 Sep 2012 13:06:43 +0000 (15:06 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flvenc: silence bogus warning
  configure: include flags in nm variable
  alsdec: fix misplaced parentheses.
  alsdec: check return values.
  alsdec: fix number of decoded samples in first sub-block in BGMC mode.
  alsdec: Fix out of ltp_gain_values read.
  alsdec: Check that quantized parcor coeffs are within range.
  alsdec: check opt_order.

Conflicts:
configure
libavcodec/alsdec.c
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'
Michael Niedermayer [Tue, 18 Sep 2012 12:30:31 +0000 (14:30 +0200)]
Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
  alsdec: Check k used for rice decoder.
  avfiltergraph: silence an uninitialized variable warning
  xsubenc: reindent
  lavc: replace AVCodecContext.encode with subtitle-specific callback
  lavc: add const to private codec class initialization.
  avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
  id3v2: strdup the genre name explicitly.
  lavf/id3v2: do not export empty fields.
  buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
  lavfi: replace empty input/output lists with null pointers

Conflicts:
ffmpeg_filter.c
libavcodec/alsdec.c
libavcodec/dvdsubenc.c
libavcodec/utils.c
libavcodec/v210dec.h
libavfilter/af_channelsplit.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_ass.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotargaenc: Use named TGA_RLE constant instead of magic number
Bobby Bingham [Tue, 18 Sep 2012 08:45:09 +0000 (10:45 +0200)]
targaenc: Use named TGA_RLE constant instead of magic number

6 years agoFix typo in targa encoder comment
Bobby Bingham [Tue, 18 Sep 2012 08:44:32 +0000 (10:44 +0200)]
Fix typo in targa encoder comment

6 years agoflvenc: silence bogus warning
Benjamin Larsson [Mon, 17 Sep 2012 19:14:58 +0000 (21:14 +0200)]
flvenc: silence bogus warning

The compiler fails to figure out that enc->codec_type can only
have 3 different values.
Thus when an if/else is encountered it triggers on the possibility
of the else case has not initialized the flags variable.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodoc: fix typos in filter documentation
Bobby Bingham [Tue, 18 Sep 2012 05:38:30 +0000 (00:38 -0500)]
doc: fix typos in filter documentation

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
6 years agodsputil: change assert(8) to av_assert2(8)
Michael Niedermayer [Tue, 18 Sep 2012 03:27:23 +0000 (05:27 +0200)]
dsputil: change assert(8) to av_assert2(8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: change assert() to av_assert()
Michael Niedermayer [Tue, 18 Sep 2012 03:19:11 +0000 (05:19 +0200)]
swscale: change assert() to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonsvdec: change 2 commented assert() to av_assert()
Michael Niedermayer [Tue, 18 Sep 2012 03:08:32 +0000 (05:08 +0200)]
nsvdec: change 2 commented assert() to av_assert()

they keep showing up if i grep for non av assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoget_cabac_inline_x86: workaround clang bug with disabled optimizations
Michael Niedermayer [Thu, 13 Sep 2012 20:24:47 +0000 (22:24 +0200)]
get_cabac_inline_x86: workaround clang bug with disabled optimizations

gcc produces binary identical output relative to before this change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: include flags in nm variable
Mans Rullgard [Sun, 16 Sep 2012 20:47:16 +0000 (21:47 +0100)]
configure: include flags in nm variable

This simplifies ensuring proper flags are used when the default
is overridden by the system or on the command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoWhen copying pkt side_data, don't forget size, type
Andrey Utkin [Mon, 17 Sep 2012 16:55:02 +0000 (19:55 +0300)]
When copying pkt side_data, don't forget size, type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: feed x264_param_apply_profile from AVCodecContext.profile in absence of...
Lyubomir Marinov [Sun, 16 Sep 2012 19:53:49 +0000 (22:53 +0300)]
libx264: feed x264_param_apply_profile from AVCodecContext.profile in absence of other information

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: connect AVCodecContext.rtp_payload_size to x264_params_t.i_slice_max_size
Lyubomir Marinov [Sun, 16 Sep 2012 09:46:27 +0000 (12:46 +0300)]
libx264: connect AVCodecContext.rtp_payload_size to x264_params_t.i_slice_max_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemove code that duplicates existing code a few lines down.
Reimar Döffinger [Mon, 17 Sep 2012 19:16:32 +0000 (21:16 +0200)]
Remove code that duplicates existing code a few lines down.

This also fixes a potential crash since s->pb can be NULL.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agodirac_arith: Fix unprotected inline asm
Derek Buitenhuis [Sun, 16 Sep 2012 23:46:02 +0000 (19:46 -0400)]
dirac_arith: Fix unprotected inline asm

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoalsdec: fix misplaced parentheses.
Clément Bœsch [Tue, 4 Sep 2012 18:30:14 +0000 (14:30 -0400)]
alsdec: fix misplaced parentheses.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoalsdec: check return values.
Thilo Borgmann [Tue, 27 Mar 2012 16:06:54 +0000 (18:06 +0200)]
alsdec: check return values.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoalsdec: fix number of decoded samples in first sub-block in BGMC mode.
Thilo Borgmann [Sun, 15 Apr 2012 16:07:12 +0000 (18:07 +0200)]
alsdec: fix number of decoded samples in first sub-block in BGMC mode.

Fixes CVE-2012-2790

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoalsdec: Fix out of ltp_gain_values read.
Thilo Borgmann [Sun, 11 Mar 2012 15:56:23 +0000 (16:56 +0100)]
alsdec: Fix out of ltp_gain_values read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoalsdec: Check that quantized parcor coeffs are within range.
Michael Niedermayer [Wed, 29 Feb 2012 05:10:17 +0000 (06:10 +0100)]
alsdec: Check that quantized parcor coeffs are within range.

ALS spec:
11.6.3.1.1 Quantization and encoding of parcor coefficients
...
In all cases the resulting quantized values ak are restricted to the range [-64,63].

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoalsdec: Check k used for rice decoder.
Michael Niedermayer [Sat, 7 Apr 2012 15:25:47 +0000 (17:25 +0200)]
alsdec: Check k used for rice decoder.

Values that fail this check will cause failure of decode_rice()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoalsdec: check opt_order.
Michael Niedermayer [Sat, 24 Mar 2012 00:39:13 +0000 (01:39 +0100)]
alsdec: check opt_order.

Fixes out of array write in quant_cof.
Also make sure no invalid opt_order stays in the context.

Fixes CVE-2012-2775

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoavfiltergraph: silence an uninitialized variable warning
Anton Khirnov [Sat, 18 Aug 2012 14:51:32 +0000 (16:51 +0200)]
avfiltergraph: silence an uninitialized variable warning

The warning is:
libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’:
libavfilter/avfiltergraph.c:528:9: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]
libavfilter/avfiltergraph.c:479:13: note: ‘best_idx’ was declared here

Initialize it to an invalid value and add an assert that it's properly
set later.

6 years agoxsubenc: reindent
Anton Khirnov [Sat, 18 Aug 2012 14:42:50 +0000 (16:42 +0200)]
xsubenc: reindent

6 years agolavc: replace AVCodecContext.encode with subtitle-specific callback
Anton Khirnov [Sat, 18 Aug 2012 14:41:24 +0000 (16:41 +0200)]
lavc: replace AVCodecContext.encode with subtitle-specific callback

AVCodecContext.encode is currently used only for subtitles, encode2 is
used for audio and video.

6 years agolavc: add const to private codec class initialization.
Anton Khirnov [Sat, 18 Aug 2012 14:21:00 +0000 (16:21 +0200)]
lavc: add const to private codec class initialization.

Silences a warning about discarding const.

6 years agoavconv: don't pass a bogus parameter to avfilter_graph_create_filter().
Anton Khirnov [Sat, 18 Aug 2012 14:15:42 +0000 (16:15 +0200)]
avconv: don't pass a bogus parameter to avfilter_graph_create_filter().

The buffer sink does not take any parameters.

Fixes an uninitialized variable warning.

6 years agoid3v2: strdup the genre name explicitly.
Clément Bœsch [Sat, 12 May 2012 20:39:30 +0000 (22:39 +0200)]
id3v2: strdup the genre name explicitly.

It would have been done anyway in the av_dict_set() call.

This simplifies the code and avoid a warning because of assigning a
const string from ff_id3v1_genre_str to a non-const variable.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavf/id3v2: do not export empty fields.
Clément Bœsch [Sat, 12 May 2012 20:31:11 +0000 (22:31 +0200)]
lavf/id3v2: do not export empty fields.

This also avoids a memleak.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agobuffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
Anton Khirnov [Sat, 18 Aug 2012 06:58:09 +0000 (08:58 +0200)]
buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()

6 years agolavfi: replace empty input/output lists with null pointers
Mans Rullgard [Sun, 16 Sep 2012 11:58:49 +0000 (12:58 +0100)]
lavfi: replace empty input/output lists with null pointers

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Sep 2012 13:12:25 +0000 (15:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: flush filtered frames before reconfiguring filters
  mov: stsd entries must be at least 16 byte
  mov: detect EOF in mov_read_dref()
  file: return proper error on seek failures

Conflicts:
libavformat/file.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add av_small_strptime() test to fate-parseutils
Stefano Sabatini [Sun, 16 Sep 2012 22:49:31 +0000 (00:49 +0200)]
fate: add av_small_strptime() test to fate-parseutils

6 years agolavu/parseutils: fix av_small_strptime() whitespace directive parsing
Stefano Sabatini [Sun, 16 Sep 2012 13:22:31 +0000 (15:22 +0200)]
lavu/parseutils: fix av_small_strptime() whitespace directive parsing

According to POSIX, strptime() should consume whitespaces in the date
string everytime a whitespace conversion specification is found in the
date format specification. Make av_small_strptime() conform with this
behavior.

In particular, should fix trac ticket #1739.

6 years agoavconv: flush filtered frames before reconfiguring filters
Janne Grunau [Thu, 6 Sep 2012 19:51:31 +0000 (21:51 +0200)]
avconv: flush filtered frames before reconfiguring filters

This prevents lost frames after a resolution change.

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 16 Sep 2012 22:40:55 +0000 (00:40 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: dont wait 100ms if data is not yet ready

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: dont wait 100ms if data is not yet ready
Marton Balint [Sun, 16 Sep 2012 17:00:51 +0000 (19:00 +0200)]
ffplay: dont wait 100ms if data is not yet ready

Also signal the wait if audio buffer is empty. This fixes jerky audio with
realtime sources.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoarm/dca: Fix compilation of decode_blockcodes() with --enable-thumb
Michael Niedermayer [Sun, 16 Sep 2012 17:05:23 +0000 (19:05 +0200)]
arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb

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