ffmpeg.git
6 years agopnmdec: use explicit casts to remove const to avoid warning with clang
Michael Niedermayer [Sat, 22 Sep 2012 02:51:47 +0000 (04:51 +0200)]
pnmdec: use explicit casts to remove const to avoid warning with clang

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: fix "warning: ret may be used uninitialized in this function"
Michael Niedermayer [Sat, 22 Sep 2012 02:47:45 +0000 (04:47 +0200)]
rtsp: fix "warning: ret may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: kill a pointer type warning (void **) vs. (AVFormatContext **)
Michael Niedermayer [Sat, 22 Sep 2012 02:45:12 +0000 (04:45 +0200)]
rtsp: kill a pointer type warning (void **) vs. (AVFormatContext **)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflac_parser: fix fifo ptr wrap check
Michael Niedermayer [Sat, 22 Sep 2012 02:40:10 +0000 (04:40 +0200)]
flac_parser: fix fifo ptr wrap check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohqdn3d: Fix out of array read in LOWPASS
Loren Merritt [Fri, 21 Sep 2012 23:43:16 +0000 (01:43 +0200)]
hqdn3d: Fix out of array read in LOWPASS

Fixes ticket1752

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/oggdec: check for begin-of-stream flag in case of chained streams.
Clément Bœsch [Sun, 16 Sep 2012 20:24:11 +0000 (22:24 +0200)]
lavf/oggdec: check for begin-of-stream flag in case of chained streams.

Fix Ticket #1617, revealing a regression I introduced in 8f3eebd.

We need to make sure no stream is added in between Ogg context save and
restore operations (because it would likely lead to a mismatch between
ogg->nstreams and AVFormatContext->nb_streams after the restore op).
This is the reason the ogg->state check is added in ogg_new_stream().
Before this patch, checking for ogg->headers was preventing this:
ogg->headers is always set before any ogg save/restore (though, it was
also preventing from creating the stream when necessary).

6 years agoffmpeg: complete mov/mp4 based timebase hack with "f4v" format.
Clément Bœsch [Fri, 21 Sep 2012 13:57:09 +0000 (15:57 +0200)]
ffmpeg: complete mov/mp4 based timebase hack with "f4v" format.

6 years agomxf: export ff_mxf_get_samples_per_frame to lavf
Matthieu Bouron [Thu, 20 Sep 2012 18:31:28 +0000 (20:31 +0200)]
mxf: export ff_mxf_get_samples_per_frame to lavf

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/movenc: add F4V flavor.
Clément Bœsch [Mon, 17 Sep 2012 14:16:16 +0000 (16:16 +0200)]
lavf/movenc: add F4V flavor.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 21 Sep 2012 12:25:21 +0000 (14:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: add forgotten ;
  matroskadec: fix a sanity check.
  matroskadec: only return corrupt packets that actually contain data
  lavf: zero data/size of the packet passed to read_packet().
  ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
  ARM: align PIC offset pools to 4 bytes
  ARM: swap source operands in some add instructions
  configure: update tms470 detection for latest version
  lavf probe: prevent codec probe with no data at all seen
  motion_est: fix use of inline on extern functions

Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: print format long_name only if non-NULL
Stefano Sabatini [Fri, 21 Sep 2012 11:58:26 +0000 (13:58 +0200)]
ffprobe: print format long_name only if non-NULL

Fix possible crash when long_name is not defined (for example if
--enable-small).

6 years agolavfi/hue: set to NULL freed pointers
Stefano Sabatini [Fri, 21 Sep 2012 10:41:00 +0000 (12:41 +0200)]
lavfi/hue: set to NULL freed pointers

Possibly safer.

6 years agolavfi/hue: fix crash when resetting the saturation expression
Stefano Sabatini [Fri, 21 Sep 2012 10:33:27 +0000 (12:33 +0200)]
lavfi/hue: fix crash when resetting the saturation expression

Previously when saturation was reinited, the old value was freed when
setting options, and freed again in PARSE_EXPRESSION().

6 years agoffprobe: print codec_long_name only when available
Stefano Sabatini [Fri, 21 Sep 2012 07:25:46 +0000 (09:25 +0200)]
ffprobe: print codec_long_name only when available

Avoid possible segmentation fault if codec_long_name is defined as
NULL (for example if --enable-small).

6 years agolibx264: add forgotten ;
Anton Khirnov [Fri, 21 Sep 2012 07:20:09 +0000 (09:20 +0200)]
libx264: add forgotten ;

6 years agomatroskadec: fix a sanity check.
Anton Khirnov [Thu, 20 Sep 2012 18:04:56 +0000 (20:04 +0200)]
matroskadec: fix a sanity check.

6 years agomatroskadec: only return corrupt packets that actually contain data
Anton Khirnov [Thu, 20 Sep 2012 18:01:43 +0000 (20:01 +0200)]
matroskadec: only return corrupt packets that actually contain data

Fixes bug 372.

6 years agolavf: zero data/size of the packet passed to read_packet().
Anton Khirnov [Thu, 20 Sep 2012 18:00:39 +0000 (20:00 +0200)]
lavf: zero data/size of the packet passed to read_packet().

6 years agoARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
Mans Rullgard [Thu, 20 Sep 2012 21:55:11 +0000 (22:55 +0100)]
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code

The Apple assembler refuses to assemble the 3-operand form
in Thumb2 even though it is valid syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: align PIC offset pools to 4 bytes
Mans Rullgard [Thu, 20 Sep 2012 21:53:41 +0000 (22:53 +0100)]
ARM: align PIC offset pools to 4 bytes

When building Thumb2 code, the end of a function, where the PIC
offsets are placed, need not be aligned.  Although the values
are only accessed with instructions allowing unaligned addresses,
keeping them aligned is preferable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agonutdec: fix mixup of nb_streams and timebase_count
Michael Niedermayer [Fri, 21 Sep 2012 04:29:24 +0000 (06:29 +0200)]
nutdec: fix mixup of nb_streams and timebase_count

Fixes out of array read, should fix ffprove fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutdec: fix type of intermediate variable for ts calculation.
Michael Niedermayer [Fri, 21 Sep 2012 04:27:38 +0000 (06:27 +0200)]
nutdec: fix type of intermediate variable for ts calculation.

Prior to this it could theoretically become negative and read
out of array.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovsrc_testsrc: Fix case without a specified duration
Michael Niedermayer [Fri, 21 Sep 2012 01:00:15 +0000 (03:00 +0200)]
vsrc_testsrc: Fix case without a specified duration

Fixes regression since 98f753ec5198d4f74ba9f68cc85badf8a6257547

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd av_copy_packet()
Andrey Utkin [Thu, 20 Sep 2012 14:30:03 +0000 (17:30 +0300)]
Add av_copy_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMove av_dup_packet() copy logic to separate procedure
Andrey Utkin [Thu, 20 Sep 2012 14:30:02 +0000 (17:30 +0300)]
Move av_dup_packet() copy logic to separate procedure

Done to simplify next commit introducing av_copy_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: matroska_parse_rm_audio: remove unused parameter
Michael Niedermayer [Thu, 20 Sep 2012 21:43:20 +0000 (23:43 +0200)]
matroskadec: matroska_parse_rm_audio: remove unused parameter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: fix seeking without xing TOC
Michael Niedermayer [Thu, 20 Sep 2012 20:00:52 +0000 (22:00 +0200)]
mp3dec: fix seeking without xing TOC

fixes regression from the xing toc support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Sep 2012 19:46:35 +0000 (21:46 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3dec: read Xing frame TOC index
  mp3dec: use named constants for Xing header flags
  libx264: add support for nal-hrd, required for Blu-ray streams.
  mov: support random access point grouping
  matroskadec: properly support BlockDuration

Conflicts:
libavcodec/libx264.c
libavformat/isom.h
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'
Michael Niedermayer [Thu, 20 Sep 2012 18:37:26 +0000 (20:37 +0200)]
Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'

* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83':
  matroskadec: split frame parsing
  matroskadec: split laces parsing

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'
Michael Niedermayer [Thu, 20 Sep 2012 17:31:24 +0000 (19:31 +0200)]
Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'

* commit '117d8c6d1f1c187ffc6098d9618457e00534e013':
  matroska: implement support for ProRes
  matroska: implement support for ALAC

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: fix typo
Michael Niedermayer [Thu, 20 Sep 2012 17:05:27 +0000 (19:05 +0200)]
matroskadec: fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '870e75524aa0d00ebcd1d15589c8d29b84af1565'
Michael Niedermayer [Thu, 20 Sep 2012 17:11:41 +0000 (19:11 +0200)]
Merge commit '870e75524aa0d00ebcd1d15589c8d29b84af1565'

* commit '870e75524aa0d00ebcd1d15589c8d29b84af1565':
  matroskadec: validate lace_size when parsed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agoARM: swap source operands in some add instructions
Mans Rullgard [Thu, 2 Aug 2012 18:17:16 +0000 (19:17 +0100)]
ARM: swap source operands in some add instructions

This allows using a 16-bit opcode when generating Thumb2 code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: update tms470 detection for latest version
Mans Rullgard [Sat, 15 Sep 2012 14:36:22 +0000 (15:36 +0100)]
configure: update tms470 detection for latest version

v5.0 of the TI ARM compiler changes the version string.
This updates the detection to check for both the old and
the new strings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavf probe: prevent codec probe with no data at all seen
Janne Grunau [Fri, 7 Sep 2012 14:27:21 +0000 (16:27 +0200)]
lavf probe: prevent codec probe with no data at all seen

This occurs with fuzzed mpeg-ts files. set_codec_from_probe_data() is
called with a zeroed AVProbeData since no packet made through for
specific stream.

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 agomotion_est: fix use of inline on extern functions
Mans Rullgard [Wed, 19 Sep 2012 21:30:06 +0000 (22:30 +0100)]
motion_est: fix use of inline on extern functions

Inline functions declared without extern do not provide an external
definition in standard C99.  This code only works because most
compilers do not implement the inline semantics correctly.  With a
stricter compiler, linking fails with unresolved references to these
functions.

Declaring the functions extern inline works correctly with some
compilers while some others still fail to create external definitions.

For maximum portability, create a static inline version with an
externally visible wrapper for ff_get_mb_score.  ff_epzs_motion_search
is so large that no sane compiler inlines it anyway, so there the
inline keyword can simply be dropped with no effect.

Signed-off-by: Mans Rullgard <mans@mansr.com>
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 agomp3dec: read Xing frame TOC index
Anton Khirnov [Sun, 2 Sep 2012 13:36:18 +0000 (15:36 +0200)]
mp3dec: read Xing frame TOC index

6 years agomp3dec: use named constants for Xing header flags
Anton Khirnov [Sat, 1 Sep 2012 22:30:41 +0000 (00:30 +0200)]
mp3dec: use named constants for Xing header flags

6 years agolibx264: add support for nal-hrd, required for Blu-ray streams.
John Van Sickle [Wed, 19 Sep 2012 17:51:29 +0000 (13:51 -0400)]
libx264: add support for nal-hrd, required for Blu-ray streams.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agomov: support random access point grouping
Yusuke Nakamura [Mon, 23 Apr 2012 23:51:29 +0000 (08:51 +0900)]
mov: support random access point grouping

Frames described by this grouping are the starter of a closed or
an open GOP.
This is useful for open GOP of H.264 stream which is not described
by sync sample atom.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomatroskadec: split frame parsing
Luca Barbato [Sun, 16 Sep 2012 23:28:13 +0000 (01:28 +0200)]
matroskadec: split frame parsing

6 years agomatroska: implement support for ProRes
Luca Barbato [Fri, 14 Sep 2012 22:59:05 +0000 (00:59 +0200)]
matroska: implement support for ProRes

Support Matroska native formatting.

On demuxing prepend a Frame container atom (32bit big endian encoded
frame size and 'icpf' string).
On muxing remove it.

6 years agomatroskadec: validate lace_size when parsed
Luca Barbato [Fri, 14 Sep 2012 19:24:23 +0000 (21:24 +0200)]
matroskadec: validate lace_size when parsed

Stricter validation, explicitly exit on misparsing and some error
forwarding from the ebml parsing functions used.

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: properly support BlockDuration
Luca Barbato [Mon, 17 Sep 2012 00:48:02 +0000 (02:48 +0200)]
matroskadec: properly support BlockDuration

6 years agomatroskadec: split laces parsing
Luca Barbato [Sun, 16 Sep 2012 23:58:32 +0000 (01:58 +0200)]
matroskadec: split laces parsing

6 years agomatroska: implement support for ALAC
Moritz Bunkus [Fri, 14 Sep 2012 20:26:14 +0000 (22:26 +0200)]
matroska: implement support for ALAC

Support Matroska native formatting.

On demuxing reconstruct the 36-bytes QuickTime atom that the ALAC
decoder expects by prepending the "atom size", "tag" and
"tag version" fields missing from the Matroska's CodecPrivate
element.

On muxing remove the initial 12 bytes

Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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>