ffmpeg.git
6 years agoMerge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'
Michael Niedermayer [Wed, 6 Mar 2013 23:18:22 +0000 (00:18 +0100)]
Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'

* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
  cavs: Add a dependency on h264chroma
  lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Conflicts:
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'
Michael Niedermayer [Wed, 6 Mar 2013 22:56:07 +0000 (23:56 +0100)]
Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'

* commit '5a4e9fe855282a99586050a507d0a486ad39df5b':
  avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
  shorten: use the unsigned type where needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'
Michael Niedermayer [Wed, 6 Mar 2013 22:47:10 +0000 (23:47 +0100)]
Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'

* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a':
  shorten: report meaningful errors

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'
Michael Niedermayer [Wed, 6 Mar 2013 22:39:52 +0000 (23:39 +0100)]
Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'

* commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca':
  shorten: K&R formatting cosmetics

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'
Michael Niedermayer [Wed, 6 Mar 2013 22:27:09 +0000 (23:27 +0100)]
Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'

* commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5':
  shorten: set invalid channels count to 0
  vorbisdec: check memory allocations
  h264: check for luma and chroma bit dept being equal

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonormalize calls to ff_alloc_packet2
James Zern [Wed, 6 Mar 2013 19:11:00 +0000 (11:11 -0800)]
normalize calls to ff_alloc_packet2

- check ret < 0
- remove excessive error log

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocavs: Add a dependency on h264chroma
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:55 +0000 (11:43 +0100)]
cavs: Add a dependency on h264chroma

This fixes standalone building of this decoder.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs
Ronald S. Bultje [Mon, 18 Feb 2013 16:15:52 +0000 (08:15 -0800)]
lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Not all hwaccels implement all codecs, so using one single list for
multiple such codecs means some codecs will be represented in the list,
even though they don't actually handle that codec. Copying specific
lists in each codec fixes that.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMove ff_cropTbl and ff_zigzag_direct from dsputil to mathtables.
Ronald S. Bultje [Sun, 3 Mar 2013 23:47:11 +0000 (15:47 -0800)]
Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables.

These are widely used throughout libavcodec, nothing dsputil-specific.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowenc: fix indention
Michael Niedermayer [Wed, 6 Mar 2013 18:26:56 +0000 (19:26 +0100)]
snowenc: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowenc: add forgotten emms_c()
Michael Niedermayer [Wed, 6 Mar 2013 18:26:40 +0000 (19:26 +0100)]
snowenc: add forgotten emms_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/concat: document the use of the files durations.
Nicolas George [Tue, 5 Mar 2013 16:14:27 +0000 (17:14 +0100)]
lavf/concat: document the use of the files durations.

Address trac ticket #2319.

6 years agoavcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
Diego Biurrun [Tue, 5 Mar 2013 10:57:51 +0000 (11:57 +0100)]
avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch

6 years agosnowenc: initialize edges
Michael Niedermayer [Wed, 6 Mar 2013 15:35:47 +0000 (16:35 +0100)]
snowenc: initialize edges

This fixes a regression caused by changes to the buffer initialization code.
Fixes valgrind warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: use av_log_ask_for_sample for odd sprites
Michael Niedermayer [Wed, 6 Mar 2013 12:45:53 +0000 (13:45 +0100)]
vc1dec: use av_log_ask_for_sample for odd sprites

Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibilbc: use ff_alloc_packet2
Paul B Mahol [Wed, 6 Mar 2013 10:42:10 +0000 (10:42 +0000)]
libilbc: use ff_alloc_packet2

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibopusenc: use ff_alloc_packet2
James Zern [Tue, 5 Mar 2013 21:19:03 +0000 (13:19 -0800)]
libopusenc: use ff_alloc_packet2

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 6 Mar 2013 09:34:14 +0000 (10:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice

Conflicts:
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 6 Mar 2013 04:37:09 +0000 (05:37 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Move the iconv test to the bottom of configure.
  Make 32bit zmbv colour-space opaque.
  Use uint8_t instead of uint16_t pointer in kega decoder.
  kgv1dec: Simplify kega decoding by using memcpy instead of loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: check "AC" codewords
Michael Niedermayer [Wed, 6 Mar 2013 04:04:15 +0000 (05:04 +0100)]
qdm2: check "AC" codewords

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: simplify arithmetic coder tables generation
Michael Niedermayer [Wed, 6 Mar 2013 03:56:33 +0000 (04:56 +0100)]
qdm2: simplify arithmetic coder tables generation

Someone should rename the variables, theres nothing random in there

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorv20: Fix handling of frame skip.
Michael Niedermayer [Wed, 6 Mar 2013 02:10:18 +0000 (03:10 +0100)]
rv20: Fix handling of frame skip.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomss2dsp/upsample_plane: fix 0x0 handling
Michael Niedermayer [Wed, 6 Mar 2013 00:37:49 +0000 (01:37 +0100)]
mss2dsp/upsample_plane: fix 0x0 handling

Fixes invalid memcpy and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoshorten: report meaningful errors
Luca Barbato [Tue, 5 Mar 2013 15:34:16 +0000 (16:34 +0100)]
shorten: report meaningful errors

6 years agoshorten: K&R formatting cosmetics
Luca Barbato [Tue, 5 Mar 2013 15:11:28 +0000 (16:11 +0100)]
shorten: K&R formatting cosmetics

6 years agoshorten: use the unsigned type where needed
Luca Barbato [Tue, 5 Mar 2013 16:12:35 +0000 (17:12 +0100)]
shorten: use the unsigned type where needed

get_uint returns an unsigned value, use an unsigned to store
blocksize to make sure the comparison logic is correct and report
correctly the error for the channel count not supported.

6 years agoshorten: set invalid channels count to 0
Michael Niedermayer [Tue, 5 Mar 2013 14:13:04 +0000 (15:13 +0100)]
shorten: set invalid channels count to 0

Prevent the loop shorten_decode_close from writing and freeing out of
the array boundary.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovorbisdec: check memory allocations
Luca Barbato [Mon, 4 Mar 2013 18:42:48 +0000 (19:42 +0100)]
vorbisdec: check memory allocations

6 years agoMove the iconv test to the bottom of configure.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:57:51 +0000 (00:57 +0100)]
Move the iconv test to the bottom of configure.

This fixes a possible mis-detection of iconv on OS X.
OS X with macports often has two version of libiconv.2.dylib
installed, one with symbols like "_iconv_open" and one with
"_libiconv_open", so test for iconv with all flags to make
sure the detection uses the same library as the actual
compilation / linking.

Tested-by: Paul Sturbaum
6 years agoMake 32bit zmbv colour-space opaque.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:38:12 +0000 (00:38 +0100)]
Make 32bit zmbv colour-space opaque.

6 years agoUse uint8_t instead of uint16_t pointer in kega decoder.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:35:08 +0000 (00:35 +0100)]
Use uint8_t instead of uint16_t pointer in kega decoder.

This change allows to remove a few casts and avoids
a potential pointer aliasing violation.

6 years agokgv1dec: Simplify kega decoding by using memcpy instead of loops
Reimar Döffinger [Tue, 5 Mar 2013 23:25:18 +0000 (00:25 +0100)]
kgv1dec: Simplify kega decoding by using memcpy instead of loops

Fixes decoding errors with icc 13.1

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agovc1dec: odd sized sprites are unsupported
Michael Niedermayer [Tue, 5 Mar 2013 23:03:58 +0000 (00:03 +0100)]
vc1dec: odd sized sprites are unsupported

It should be easy to add support but without a sample we would
not know if they work.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoasfdec: dont truncate type 2-5 values
Michael Niedermayer [Tue, 5 Mar 2013 20:56:46 +0000 (21:56 +0100)]
asfdec: dont truncate type 2-5 values

Fixes use of uninitialized variables and possible out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_stereo3d: Add AVOption table terminator
Michael Niedermayer [Tue, 5 Mar 2013 21:29:17 +0000 (22:29 +0100)]
vf_stereo3d: Add AVOption table terminator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: check for luma and chroma bit dept being equal
Luca Barbato [Mon, 4 Mar 2013 10:21:08 +0000 (11:21 +0100)]
h264: check for luma and chroma bit dept being equal

The decoder assumes a single bit depth for all the planes
while the specification allows different bit depths for luma
and chroma.

Avoid the possible problems described in CVE-2013-2277

CC: libav-stable@libav.org
6 years agolavfi/deshake: support named options.
Clément Bœsch [Tue, 5 Mar 2013 19:16:51 +0000 (20:16 +0100)]
lavfi/deshake: support named options.

6 years agodoc/filters: make examples a bit more consistent.
Clément Bœsch [Tue, 5 Mar 2013 20:08:16 +0000 (21:08 +0100)]
doc/filters: make examples a bit more consistent.

Create dedicated subsection and itemize. Not done for every filters, but
a large part is done.

6 years agodoc/showspectrum: add some examples.
Clément Bœsch [Tue, 5 Mar 2013 19:37:58 +0000 (20:37 +0100)]
doc/showspectrum: add some examples.

6 years agolavfi/overlay: improve log message warning in case of clipped overlay
Stefano Sabatini [Tue, 19 Feb 2013 18:03:30 +0000 (19:03 +0100)]
lavfi/overlay: improve log message warning in case of clipped overlay

6 years agolavfi/overlay: add support for partial overlaying
Stefano Sabatini [Tue, 5 Mar 2013 18:38:15 +0000 (19:38 +0100)]
lavfi/overlay: add support for partial overlaying

Partially rework the iteration logic, in order to limit iteration only
for the clipped overlay region.

6 years agolavfi/mp: drop mp=stereo3d filter
Paul B Mahol [Tue, 5 Mar 2013 18:45:35 +0000 (18:45 +0000)]
lavfi/mp: drop mp=stereo3d filter

The filter has been natively integrated into libavfilter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: port MP stereo3d filter
Paul B Mahol [Fri, 1 Mar 2013 17:35:52 +0000 (17:35 +0000)]
lavfi: port MP stereo3d filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/concat: compute duration if possible.
Nicolas George [Wed, 13 Feb 2013 18:25:26 +0000 (19:25 +0100)]
lavf/concat: compute duration if possible.

6 years agoexamples/muxing: fix memory leak.
Nicolas George [Tue, 5 Mar 2013 14:19:47 +0000 (15:19 +0100)]
examples/muxing: fix memory leak.

Do not re-call avcodec_get_context_defaults3(), it is already
called by avformat_new_stream() and it leaks the codec
priv_data that was already allocated.

Use avformat_free_context() instead of freeing (not)
everything manually.

Fix trac ticket #2322.

6 years agolavu/eval: add native support to lte and lt functions
Stefano Sabatini [Tue, 5 Mar 2013 12:39:27 +0000 (13:39 +0100)]
lavu/eval: add native support to lte and lt functions

6 years agodoc/muxers: specify that tee needs -map.
Nicolas George [Thu, 28 Feb 2013 18:42:21 +0000 (19:42 +0100)]
doc/muxers: specify that tee needs -map.

Address trac ticket #2311.

6 years agoRevert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"
Nicolas George [Tue, 5 Mar 2013 13:10:10 +0000 (14:10 +0100)]
Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"

This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88.

Conflicts:
libavformat/version.h

Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.

6 years agolavu/opt: fix weird align
Stefano Sabatini [Mon, 4 Mar 2013 17:38:45 +0000 (18:38 +0100)]
lavu/opt: fix weird align

6 years agolavu/opt-test: do not explicitly set default value in test_ctx
Stefano Sabatini [Mon, 4 Mar 2013 17:34:35 +0000 (18:34 +0100)]
lavu/opt-test: do not explicitly set default value in test_ctx

Let av_opt_set_defaults() set the value, which is simpler and more
idiomatic.

6 years agotests: add overlay rgb and yuv444 tests
Stefano Sabatini [Tue, 5 Mar 2013 00:42:00 +0000 (01:42 +0100)]
tests: add overlay rgb and yuv444 tests

Also rename overlay test to overlay_yuv420 accordingly.

6 years agomp3dec: Fix VBR bit rate parsing
Alexander Kojevnikov [Wed, 27 Feb 2013 05:47:11 +0000 (21:47 -0800)]
mp3dec: Fix VBR bit rate parsing

When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add dependency for xface
Paul B Mahol [Tue, 5 Mar 2013 11:39:55 +0000 (11:39 +0000)]
fate: add dependency for xface

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 5 Mar 2013 11:37:15 +0000 (12:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Use check_builtin() where appropriate

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35'
Michael Niedermayer [Tue, 5 Mar 2013 11:23:38 +0000 (12:23 +0100)]
Merge commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35'

* commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35':
  configure: Add check_builtin convenience function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f868b24d0f280bb966e5c352028a343e45d20a02'
Michael Niedermayer [Tue, 5 Mar 2013 11:17:10 +0000 (12:17 +0100)]
Merge commit 'f868b24d0f280bb966e5c352028a343e45d20a02'

* commit 'f868b24d0f280bb966e5c352028a343e45d20a02':
  configure: Add sanitize_var_name convenience function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'
Michael Niedermayer [Tue, 5 Mar 2013 11:11:48 +0000 (12:11 +0100)]
Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'

* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
  configure: Fix silly typo in logging command of check_struct()
  fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agozmbv: stop doing colorspace conversion
Paul B Mahol [Sat, 2 Mar 2013 18:15:37 +0000 (18:15 +0000)]
zmbv: stop doing colorspace conversion

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agohwaccel: consistent name prefixes for start_frame/end_frame/decode_slice
Diego Biurrun [Fri, 22 Feb 2013 20:25:00 +0000 (21:25 +0100)]
hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice

Some hwaccels use name prefixes, some do not, others only use them for
some codecs.  Add prefixes everywhere for consistency.

6 years agodoc/filters: fix short options for noise filter
Paul B Mahol [Tue, 5 Mar 2013 10:18:21 +0000 (10:18 +0000)]
doc/filters: fix short options for noise filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: Use check_builtin() where appropriate
Diego Biurrun [Mon, 4 Mar 2013 22:02:02 +0000 (23:02 +0100)]
configure: Use check_builtin() where appropriate

6 years agoconfigure: Add check_builtin convenience function
Diego Biurrun [Mon, 4 Mar 2013 21:59:41 +0000 (22:59 +0100)]
configure: Add check_builtin convenience function

6 years agoconfigure: Add sanitize_var_name convenience function
Diego Biurrun [Mon, 4 Mar 2013 21:58:34 +0000 (22:58 +0100)]
configure: Add sanitize_var_name convenience function

This is useful in all the places where special characters in
variable names are manually translated to underscores.

6 years agoconfigure: Fix silly typo in logging command of check_struct()
Diego Biurrun [Mon, 4 Mar 2013 21:56:41 +0000 (22:56 +0100)]
configure: Fix silly typo in logging command of check_struct()

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 5 Mar 2013 03:24:57 +0000 (04:24 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add h264chroma dependency for mpegvideo / lowres to configure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsrledec: fix output_end checks
Michael Niedermayer [Tue, 5 Mar 2013 01:19:12 +0000 (02:19 +0100)]
msrledec: fix output_end checks

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoiff: fix integer overflow
Michael Niedermayer [Tue, 5 Mar 2013 00:35:28 +0000 (01:35 +0100)]
iff: fix integer overflow

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd h264chroma dependency for mpegvideo / lowres to configure.
Carl Eugen Hoyos [Tue, 5 Mar 2013 00:07:12 +0000 (01:07 +0100)]
Add h264chroma dependency for mpegvideo / lowres to configure.

Fix building for some unusual configurations.

6 years agoupdate_stream_timings: check bitrate for being in range.
Michael Niedermayer [Mon, 4 Mar 2013 17:54:00 +0000 (18:54 +0100)]
update_stream_timings: check bitrate for being in range.

Fixes numerical overflow
Fixes Ticket2089

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhddec: return the correct number of bytes from decode_frame
Michael Niedermayer [Mon, 4 Mar 2013 17:17:47 +0000 (18:17 +0100)]
dnxhddec: return the correct number of bytes from decode_frame

Fixes Ticket2022

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Make duration estimation from pts more robust
Michael Niedermayer [Mon, 4 Mar 2013 17:01:32 +0000 (18:01 +0100)]
avformat: Make duration estimation from pts more robust

Ignore durations which differ significantly from the previous
Fixes Ticket2018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutdec: more specific return codes for decode_syncpoint()
Michael Niedermayer [Mon, 4 Mar 2013 15:51:21 +0000 (16:51 +0100)]
nutdec: more specific return codes for decode_syncpoint()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutdec: print error on invalid/unsupported fourcc style
Michael Niedermayer [Mon, 4 Mar 2013 15:49:17 +0000 (16:49 +0100)]
nutdec: print error on invalid/unsupported fourcc style

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 4 Mar 2013 13:45:48 +0000 (14:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  buildsys: only include log2_tab per library for shared builds
  Add h264chroma dependency for cavs decoder to configure.
  Add h264qpel dependency for snow codec to configure.
  Add h264chroma dependency for vp5 and vp6 decoder to configure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: [autodetect] -> [no] in iconv help.
Clément Bœsch [Mon, 4 Mar 2013 12:12:25 +0000 (13:12 +0100)]
build: [autodetect] -> [no] in iconv help.

6 years agobuildsys: only include log2_tab per library for shared builds
Michael Niedermayer [Mon, 4 Mar 2013 11:25:02 +0000 (12:25 +0100)]
buildsys: only include log2_tab per library for shared builds

Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agoAdd h264chroma dependency for cavs decoder to configure.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:55 +0000 (11:43 +0100)]
Add h264chroma dependency for cavs decoder to configure.

Fix building for some unusual configurations.

6 years agoAdd h264qpel dependency for snow codec to configure.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:09 +0000 (11:43 +0100)]
Add h264qpel dependency for snow codec to configure.

Fix building for some unusual configurations.

6 years agoAdd h264chroma dependency for vp5 and vp6 decoder to configure.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:39:44 +0000 (11:39 +0100)]
Add h264chroma dependency for vp5 and vp6 decoder to configure.

Fix building for some unusual configurations.

6 years agofate: remove last incomplete frame from mpeg2-field-enc test
Janne Grunau [Mon, 4 Mar 2013 09:18:21 +0000 (10:18 +0100)]
fate: remove last incomplete frame from mpeg2-field-enc test

6 years agocompat/strtod: isspace -> av_isspace.
Clément Bœsch [Mon, 4 Mar 2013 02:37:36 +0000 (03:37 +0100)]
compat/strtod: isspace -> av_isspace.

This should fix build after 88d55b8.

6 years agobuild: disable iconv by default.
Clément Bœsch [Sun, 3 Mar 2013 21:48:16 +0000 (22:48 +0100)]
build: disable iconv by default.

It seems to break a lot on MacOS because of a mixup between multiple
iconv libraries. The issue is that the configure check link with no
particular library path (so it uses /usr/lib/libiconv.dylib where all
the symbols are defined). OTOH, the final build might link with extra
library paths, such as the ports lib directory (typically you get
-L/opt/local/lib because of an extra library such as SDL). Whatever this
option position (before or after -liconv), it will try to link with
/opt/local/lib/libiconv.dylib, and the issue is that this version has
the same symbols as the ones in /usr/lib/libiconv.dylib except that they
all start with 'lib' (libiconv_open, libiconv_close, ...). I don't plan
to try to workaround this mess, so any better solution is welcome.

6 years agodoc/filters: fix degrees/radians copy/paste fail.
Clément Bœsch [Sun, 3 Mar 2013 22:49:46 +0000 (23:49 +0100)]
doc/filters: fix degrees/radians copy/paste fail.

6 years agoffmpeg_opt: Ask for overwrite in single image2 files too
Michael Niedermayer [Sun, 3 Mar 2013 21:02:22 +0000 (22:02 +0100)]
ffmpeg_opt: Ask for overwrite in single image2 files too

Fixes Ticket1637

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/opencv: isgraph -> av_isgraph.
Clément Bœsch [Sun, 3 Mar 2013 21:06:48 +0000 (22:06 +0100)]
lavfi/opencv: isgraph -> av_isgraph.

Fix build after 88d55b8.

6 years agoRemove incorrect use of ctype.h functions.
Reimar Döffinger [Sun, 3 Mar 2013 10:17:50 +0000 (11:17 +0100)]
Remove incorrect use of ctype.h functions.

As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoDeprecate deinterlaced in libavcodec.
Ronald S. Bultje [Sun, 3 Mar 2013 16:23:08 +0000 (08:23 -0800)]
Deprecate deinterlaced in libavcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix -stats -v 0
Michael Niedermayer [Sun, 3 Mar 2013 18:33:37 +0000 (19:33 +0100)]
ffmpeg: fix -stats -v 0

Fixes Ticket1687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: gather aspect ratio from rv30/40 in find_stream_info
Michael Niedermayer [Sun, 3 Mar 2013 17:41:16 +0000 (18:41 +0100)]
avformat: gather aspect ratio from rv30/40 in find_stream_info

Fixes Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorv34: fix aspect ratio
Michael Niedermayer [Sun, 3 Mar 2013 17:14:08 +0000 (18:14 +0100)]
rv34: fix aspect ratio

Fixes part of Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmadec: check nb_frames
Michael Niedermayer [Sun, 3 Mar 2013 15:50:47 +0000 (16:50 +0100)]
wmadec: check nb_frames

Improves error message for Ticket968

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 3 Mar 2013 13:04:48 +0000 (14:04 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.
Ronald S. Bultje [Sun, 3 Mar 2013 01:03:38 +0000 (17:03 -0800)]
h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.

The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: make it possible to compile without error_resilience.
Ronald S. Bultje [Sun, 3 Mar 2013 00:57:26 +0000 (16:57 -0800)]
h264: make it possible to compile without error_resilience.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: Do not flag secondary audio and subtitle tracks as enabled.
Michael Niedermayer [Sat, 2 Mar 2013 14:57:48 +0000 (15:57 +0100)]
movenc: Do not flag secondary audio and subtitle tracks as enabled.

Fixes ticket #468 and ticket #1174.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 3 Mar 2013 10:40:29 +0000 (11:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Initialize some variables to silence compiler warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: add a copy of draw_horiz_band.
Ronald S. Bultje [Sat, 2 Mar 2013 19:22:02 +0000 (11:22 -0800)]
h264: add a copy of draw_horiz_band.

This makes the decoder independent of mpegvideo.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibxvid: cleanup on error pathes
Michael Niedermayer [Sat, 2 Mar 2013 19:39:38 +0000 (20:39 +0100)]
libxvid: cleanup on error pathes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibxvid: check & clear encoder_handle
Michael Niedermayer [Sat, 2 Mar 2013 19:32:21 +0000 (20:32 +0100)]
libxvid: check & clear encoder_handle

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibxvid: use av_freep() for saftey
Michael Niedermayer [Sat, 2 Mar 2013 19:29:47 +0000 (20:29 +0100)]
libxvid: use av_freep() for saftey

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