ffmpeg.git
7 years agolzwenc: change assert to av_assert
Michael Niedermayer [Thu, 18 Oct 2012 19:42:04 +0000 (21:42 +0200)]
lzwenc: change assert to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmv: remove unreachable default case
Michael Niedermayer [Thu, 18 Oct 2012 18:49:20 +0000 (20:49 +0200)]
bmv: remove unreachable default case

Fixes CID732191
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: prevent printing uninitialized variable
Michael Niedermayer [Thu, 18 Oct 2012 18:41:51 +0000 (20:41 +0200)]
indeo4: prevent printing uninitialized variable

Fixes CID703822
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv: change assert(a2 < 4) to av_assert()
Michael Niedermayer [Thu, 18 Oct 2012 18:29:03 +0000 (20:29 +0200)]
dv: change assert(a2 < 4) to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: retry reading metadata without padding if it fails with
Michael Niedermayer [Thu, 18 Oct 2012 02:58:20 +0000 (04:58 +0200)]
riff: retry reading metadata without padding if it fails with

Fixes Ticket1821

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: dont discard truncated metadata
Michael Niedermayer [Thu, 18 Oct 2012 02:57:27 +0000 (04:57 +0200)]
riff: dont discard truncated metadata

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 18 Oct 2012 10:16:08 +0000 (12:16 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
  fate: list lavfi tests in a makefile

Conflicts:
configure
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'
Michael Niedermayer [Thu, 18 Oct 2012 09:42:42 +0000 (11:42 +0200)]
Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'

* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
  fate: dependencies for seek tests
  fate: handle lavf test dependencies entirely in make

Conflicts:
configure
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: dependencies for ffmpeg vsynth tests
Michael Niedermayer [Thu, 18 Oct 2012 09:01:53 +0000 (11:01 +0200)]
fate: dependencies for ffmpeg vsynth tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: dependencies for ffmpeg acodec tests
Michael Niedermayer [Thu, 18 Oct 2012 09:01:15 +0000 (11:01 +0200)]
fate: dependencies for ffmpeg acodec tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'
Michael Niedermayer [Thu, 18 Oct 2012 08:29:17 +0000 (10:29 +0200)]
Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'

* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
  fate: dependencies for acodec tests
  fate: dependencies for vsynth tests
  fate: add macros useful for conditionally enabling things
  libmp3lame: resize the output buffer if needed

Conflicts:
tests/fate/acodec.mak
tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocache: check lseek() return
Michael Niedermayer [Wed, 17 Oct 2012 22:55:03 +0000 (00:55 +0200)]
cache: check lseek() return

Fixes CID717496
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: add missing check for ftell() return
Michael Niedermayer [Wed, 17 Oct 2012 22:10:59 +0000 (00:10 +0200)]
cmdutils: add missing check for ftell() return

Fixed CID703706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
Mans Rullgard [Wed, 17 Oct 2012 18:45:54 +0000 (19:45 +0100)]
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: dependencies for seek tests
Mans Rullgard [Tue, 16 Oct 2012 13:20:57 +0000 (14:20 +0100)]
fate: dependencies for seek tests

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: dependencies for acodec tests
Mans Rullgard [Tue, 16 Oct 2012 02:14:59 +0000 (03:14 +0100)]
fate: dependencies for acodec tests

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: list lavfi tests in a makefile
Mans Rullgard [Tue, 16 Oct 2012 13:35:05 +0000 (14:35 +0100)]
fate: list lavfi tests in a makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: handle lavf test dependencies entirely in make
Mans Rullgard [Tue, 16 Oct 2012 13:06:41 +0000 (14:06 +0100)]
fate: handle lavf test dependencies entirely in make

This makes the lavf tests depend on all codecs and formats they use.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: dependencies for vsynth tests
Mans Rullgard [Tue, 16 Oct 2012 13:37:16 +0000 (14:37 +0100)]
fate: dependencies for vsynth tests

This makes the vsynth tests run only if the required codecs and
formats are enabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: add macros useful for conditionally enabling things
Mans Rullgard [Tue, 16 Oct 2012 13:38:44 +0000 (14:38 +0100)]
fate: add macros useful for conditionally enabling things

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: do not quote arguments passed to filter{,_out} in check_ld.
Alexis Ballier [Wed, 17 Oct 2012 18:52:11 +0000 (15:52 -0300)]
configure: do not quote arguments passed to filter{,_out} in check_ld.

This fixes the following error:
./configure: eval: line 417: syntax error near unexpected token `-lcdio_cdda'
[...]
Broken by 66a1ccd74 when doing, e.g., ./configure --enable-gpl --enable-libcdio.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: remove unneeded null check
Michael Niedermayer [Wed, 17 Oct 2012 21:15:19 +0000 (23:15 +0200)]
cmdutils: remove unneeded null check

Fixes CID703769
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/muxing: merge add_audio_stream() and add_video_stream()
Stefano Sabatini [Fri, 3 Aug 2012 16:18:23 +0000 (18:18 +0200)]
examples/muxing: merge add_audio_stream() and add_video_stream()

Factorize.

7 years agoexamples/muxing: check on frame
Stefano Sabatini [Wed, 17 Oct 2012 09:08:53 +0000 (11:08 +0200)]
examples/muxing: check on frame

Fix crash in case frame is not defined (e.g. with muxing out.wav).

7 years agoexamples/muxing: fix bogus setting of st->id
Stefano Sabatini [Wed, 17 Oct 2012 09:08:18 +0000 (11:08 +0200)]
examples/muxing: fix bogus setting of st->id

7 years agoexamples/muxing: remove misleading comment about pending API change
Stefano Sabatini [Wed, 17 Oct 2012 08:46:55 +0000 (10:46 +0200)]
examples/muxing: remove misleading comment about pending API change

The API was never changed since 2003. Replace with a comment about the
performed operation.

7 years agoexamples/muxing: remove video_outbuf unused and useless code
Stefano Sabatini [Wed, 17 Oct 2012 08:45:22 +0000 (10:45 +0200)]
examples/muxing: remove video_outbuf unused and useless code

7 years agolavfi/avf_concat: fix invalid exclusive test.
Nicolas George [Wed, 17 Oct 2012 17:54:22 +0000 (19:54 +0200)]
lavfi/avf_concat: fix invalid exclusive test.

The invalid test did not cause any actual problem since
the first branch is only possible with bogus filters.

Fix coverity issue CID 733850.

7 years agotiff: run strlen() after setting the pointer
Michael Niedermayer [Wed, 17 Oct 2012 18:58:08 +0000 (20:58 +0200)]
tiff: run strlen() after setting the pointer

Fixes CID733803
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmdec: check av_new_packet() return value
Michael Niedermayer [Wed, 17 Oct 2012 18:45:59 +0000 (20:45 +0200)]
ffmdec: check av_new_packet() return value

Fixes CID733711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmdec: fix hypothetical overflows
Michael Niedermayer [Wed, 17 Oct 2012 18:36:30 +0000 (20:36 +0200)]
ffmdec: fix hypothetical overflows

Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffm_read_write_index: check lseek return code
Michael Niedermayer [Wed, 17 Oct 2012 18:24:47 +0000 (20:24 +0200)]
ffm_read_write_index: check lseek return code

Fixes CID732184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffm_write_write_index: check lseek() return code
Michael Niedermayer [Wed, 17 Oct 2012 18:23:16 +0000 (20:23 +0200)]
ffm_write_write_index: check lseek() return code

Fixes CID732185
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffm_seek: fix division by zero
Michael Niedermayer [Wed, 17 Oct 2012 18:14:43 +0000 (20:14 +0200)]
ffm_seek: fix division by zero

Fixes CID732202
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter/lavfutils: remove useless NULL check on format context
Michael Niedermayer [Wed, 17 Oct 2012 18:00:31 +0000 (20:00 +0200)]
libavfilter/lavfutils: remove useless NULL check on format context

Fixes: CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter/lavfutils: remove useless NULL check on codec context
Michael Niedermayer [Wed, 17 Oct 2012 17:55:13 +0000 (19:55 +0200)]
libavfilter/lavfutils: remove useless NULL check on codec context

The code would crash before if it was NULL

Fixes CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov_probe: fix integer overflows
Michael Niedermayer [Wed, 17 Oct 2012 15:20:12 +0000 (17:20 +0200)]
mov_probe: fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoidcinvideo: remove redundant " id CIN Video: " from av_log()
Paul B Mahol [Wed, 17 Oct 2012 14:06:35 +0000 (14:06 +0000)]
idcinvideo: remove redundant "  id CIN Video: " from av_log()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibmp3lame: resize the output buffer if needed
Justin Ruggles [Tue, 16 Oct 2012 18:07:04 +0000 (14:07 -0400)]
libmp3lame: resize the output buffer if needed

The LAME API documentation for the required buffer size refers to the size for
a single encode call. However, we store multiple frames in the same output
buffer but only read 1 frame at a time out of it. As a result, the buffer size
given in lame_encode_buffer() is actually smaller than what it should be.
Since we do not know how many frames it will end up buffering, it is best to
just reallocate if needed.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 17 Oct 2012 13:53:42 +0000 (15:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
Michael Niedermayer [Wed, 17 Oct 2012 13:50:45 +0000 (15:50 +0200)]
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'

* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
  wav: do not fail on empty INFO tags

Conflicts:
libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '31c54711cc3f1484af101d629bbb805820d37ad1'
Michael Niedermayer [Wed, 17 Oct 2012 13:36:36 +0000 (15:36 +0200)]
Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'

* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
  lavf: split wav muxer and demuxer into separate files.

Conflicts:
libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'
Michael Niedermayer [Wed, 17 Oct 2012 13:01:05 +0000 (15:01 +0200)]
Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0bca0283ccded5e32da143a462168ad1988a58fd'
Michael Niedermayer [Wed, 17 Oct 2012 12:43:26 +0000 (14:43 +0200)]
Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'

* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
tests/ref/fate/vsynth1-cljr
tests/ref/fate/vsynth1-ffvhuff
tests/ref/fate/vsynth1-h261
tests/ref/fate/vsynth1-h263
tests/ref/fate/vsynth1-h263-obmc
tests/ref/fate/vsynth1-h263p
tests/ref/fate/vsynth1-huffyuv
tests/ref/fate/vsynth1-jpegls
tests/ref/fate/vsynth1-mjpeg
tests/ref/fate/vsynth1-mpeg4-adap
tests/ref/fate/vsynth1-mpeg4-adv
tests/ref/fate/vsynth1-mpeg4-error
tests/ref/fate/vsynth1-mpeg4-nr
tests/ref/fate/vsynth1-mpeg4-qpel
tests/ref/fate/vsynth1-mpeg4-qprd
tests/ref/fate/vsynth1-mpeg4-rc
tests/ref/fate/vsynth1-mpeg4-thread
tests/ref/fate/vsynth1-msmpeg4
tests/ref/fate/vsynth1-msmpeg4v2
tests/ref/fate/vsynth1-rgb
tests/ref/fate/vsynth1-wmv1
tests/ref/fate/vsynth1-wmv2
tests/ref/fate/vsynth1-yuv
tests/ref/fate/vsynth2-cljr
tests/ref/fate/vsynth2-ffvhuff
tests/ref/fate/vsynth2-h261
tests/ref/fate/vsynth2-h263
tests/ref/fate/vsynth2-h263-obmc
tests/ref/fate/vsynth2-h263p
tests/ref/fate/vsynth2-huffyuv
tests/ref/fate/vsynth2-jpegls
tests/ref/fate/vsynth2-mjpeg
tests/ref/fate/vsynth2-mpeg4-adap
tests/ref/fate/vsynth2-mpeg4-error
tests/ref/fate/vsynth2-mpeg4-nr
tests/ref/fate/vsynth2-mpeg4-qpel
tests/ref/fate/vsynth2-mpeg4-qprd
tests/ref/fate/vsynth2-mpeg4-rc
tests/ref/fate/vsynth2-mpeg4-thread
tests/ref/fate/vsynth2-msmpeg4
tests/ref/fate/vsynth2-msmpeg4v2
tests/ref/fate/vsynth2-rgb
tests/ref/fate/vsynth2-wmv1
tests/ref/fate/vsynth2-wmv2
tests/ref/fate/vsynth2-yuv
tests/ref/lavf/avi
tests/ref/seek/h261_avi
tests/ref/seek/h263_avi
tests/ref/seek/h263p_avi
tests/ref/seek/lavf_avi
tests/ref/seek/mjpeg_avi
tests/ref/seek/mpeg4_adap_avi
tests/ref/seek/mpeg4_error_avi
tests/ref/seek/mpeg4_nr_avi
tests/ref/seek/mpeg4_qpel_avi
tests/ref/seek/mpeg4_qprd_avi
tests/ref/seek/mpeg4_rc_avi
tests/ref/seek/mpeg4_thread_avi
tests/ref/seek/msmpeg4_avi
tests/ref/seek/msmpeg4v2_avi
tests/ref/seek/wmv1_avi
tests/ref/seek/wmv2_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
Michael Niedermayer [Wed, 17 Oct 2012 12:30:25 +0000 (14:30 +0200)]
Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
ffmpeg_opt.c
libavformat/riff.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a25d912dca9cd553440167e0476c47581359c0fc'
Michael Niedermayer [Wed, 17 Oct 2012 12:17:55 +0000 (14:17 +0200)]
Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'

* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
ffserver.c
libavcodec/ffv1.c
libavformat/ffmdec.c
libavformat/nutenc.c
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/tta: use meaningful error codes
Paul B Mahol [Wed, 17 Oct 2012 12:10:42 +0000 (12:10 +0000)]
lavc/tta: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotta: datalen is unsigned integer per reference library
Paul B Mahol [Wed, 17 Oct 2012 09:12:18 +0000 (09:12 +0000)]
tta: datalen is unsigned integer per reference library

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosws-test: parse command line args before initing contexts
Michael Niedermayer [Tue, 16 Oct 2012 20:10:35 +0000 (22:10 +0200)]
sws-test: parse command line args before initing contexts

This fixes parsing comand line args after ref

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/swfdec: support DefineBitsLossless{,2} tag.
Clément Bœsch [Fri, 12 Oct 2012 21:20:31 +0000 (23:20 +0200)]
lavf/swfdec: support DefineBitsLossless{,2} tag.

7 years agoffv1: fix packed rgb with 1.3
Michael Niedermayer [Wed, 17 Oct 2012 01:19:11 +0000 (03:19 +0200)]
ffv1: fix packed rgb with 1.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: fix time types related to mov_metadata_creation_time
Michael Niedermayer [Wed, 17 Oct 2012 00:48:30 +0000 (02:48 +0200)]
mov: fix time types related to mov_metadata_creation_time

Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/muxing: fix video pts
Michael Niedermayer [Wed, 17 Oct 2012 00:32:43 +0000 (02:32 +0200)]
examples/muxing: fix video pts

Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Add support for Tilera processors
Derek Buitenhuis [Tue, 16 Oct 2012 18:21:06 +0000 (18:21 +0000)]
configure: Add support for Tilera processors

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agolavfi: limit matching w/h/fmt asserts to non scale filters
Michael Niedermayer [Tue, 16 Oct 2012 21:58:26 +0000 (23:58 +0200)]
lavfi: limit matching w/h/fmt asserts to non scale filters

This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter/buffersrc: Do not fail hard on changes of input parameters.
Michael Niedermayer [Tue, 16 Oct 2012 21:52:53 +0000 (23:52 +0200)]
libavfilter/buffersrc: Do not fail hard on changes of input parameters.

Several filters support this already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Make video filter graph reinit user selectable
Michael Niedermayer [Tue, 16 Oct 2012 21:50:06 +0000 (23:50 +0200)]
ffmpeg: Make video filter graph reinit user selectable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyuvPlanartouyvy_c: fix sign extension
Michael Niedermayer [Tue, 16 Oct 2012 19:06:24 +0000 (21:06 +0200)]
yuvPlanartouyvy_c: fix sign extension

Fixes CID732281
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyuvPlanartoyuy2_c: fix sign extension
Michael Niedermayer [Tue, 16 Oct 2012 18:50:53 +0000 (20:50 +0200)]
yuvPlanartoyuy2_c: fix sign extension

Fixes CID732282
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3enc: remove unneeded null ptr check
Michael Niedermayer [Tue, 16 Oct 2012 18:27:16 +0000 (20:27 +0200)]
mp3enc: remove unneeded null ptr check

Fixes: CID733746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: print warning if ff_get_wav_header() fails
Michael Niedermayer [Tue, 16 Oct 2012 18:21:31 +0000 (20:21 +0200)]
mov: print warning if ff_get_wav_header() fails

Fixes CID717497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosierravmd: flip reduce arg order.
Michael Niedermayer [Tue, 16 Oct 2012 18:03:37 +0000 (20:03 +0200)]
sierravmd: flip reduce arg order.

This should make no difference but might help static analyzers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonut: fix int32 overflow
Michael Niedermayer [Tue, 16 Oct 2012 17:59:01 +0000 (19:59 +0200)]
nut: fix int32 overflow

Fixes CID700574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: fix division by zero for G726
Michael Niedermayer [Tue, 16 Oct 2012 17:56:05 +0000 (19:56 +0200)]
riff: fix division by zero for G726

Fixes CID717752
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: fix division by 0
Michael Niedermayer [Tue, 16 Oct 2012 17:40:57 +0000 (19:40 +0200)]
swr-test: fix division by 0

Fixes CID733739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: check pointers before use
Michael Niedermayer [Tue, 16 Oct 2012 17:38:08 +0000 (19:38 +0200)]
swr-test: check pointers before use

Fixes: CID733807, CID733806
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavdec: check size before reading the data, not after.
Anton Khirnov [Tue, 16 Oct 2012 08:37:29 +0000 (10:37 +0200)]
wavdec: check size before reading the data, not after.

7 years agowav: do not fail on empty INFO tags
Anton Khirnov [Tue, 16 Oct 2012 08:33:52 +0000 (10:33 +0200)]
wav: do not fail on empty INFO tags

Fixes Bug 379

CC: libav-stable@libav.org
7 years agolavf: split wav muxer and demuxer into separate files.
Anton Khirnov [Tue, 16 Oct 2012 08:23:29 +0000 (10:23 +0200)]
lavf: split wav muxer and demuxer into separate files.

7 years agowav muxer: write metadata
Victor Vasiliev [Tue, 16 Oct 2012 08:10:16 +0000 (10:10 +0200)]
wav muxer: write metadata

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoriff: do not write empty INFO tags
Victor Vasiliev [Tue, 16 Oct 2012 08:31:22 +0000 (10:31 +0200)]
riff: do not write empty INFO tags

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavf: move RIFF INFO tag writing from avienc to riff
Victor Vasiliev [Fri, 25 Nov 2011 19:29:12 +0000 (23:29 +0400)]
lavf: move RIFF INFO tag writing from avienc to riff

It will be useful in the wav muxer.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavconv: fix disabling auto mappings with -map_metadata
Anton Khirnov [Tue, 16 Oct 2012 07:53:39 +0000 (09:53 +0200)]
avconv: fix disabling auto mappings with -map_metadata

CC: libav-stable@libav.org
7 years agoavcodec_encode_audio(): fix invalid free
Rafaël Carré [Mon, 15 Oct 2012 16:41:55 +0000 (18:41 +0200)]
avcodec_encode_audio(): fix invalid free

Since 2bc0de385, AVFrame needs to be initialized
before calling avcodec_get_frame_defaults().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agopcm-mpeg: correct bitrate calculation
Christian Schmidt [Tue, 16 Oct 2012 13:40:58 +0000 (15:40 +0200)]
pcm-mpeg: correct bitrate calculation

Bitrate calculation is off since the bluray spec always specifies
an even number of coded channels. This was honored in the decoder,
but not for bitrate calculation.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoffv1: K&R formatting cosmetics
Luca Barbato [Thu, 11 Oct 2012 16:55:53 +0000 (18:55 +0200)]
ffv1: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agofate: Add rangecoder test
Diego Biurrun [Fri, 5 Oct 2012 17:02:42 +0000 (19:02 +0200)]
fate: Add rangecoder test

7 years agonetwork: #include stdint.h in network.h
Mans Rullgard [Sat, 13 Oct 2012 21:57:23 +0000 (22:57 +0100)]
network: #include stdint.h in network.h

This header uses various types provided by stdint.h without
explicitly including it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agonut: export codec_tag provided by rawvideo
Luca Barbato [Sat, 13 Oct 2012 17:10:57 +0000 (19:10 +0200)]
nut: export codec_tag provided by rawvideo

Raw audio does not provide valid audio tags while rawvideo does.
The fate refs have to be updated because it undoes the previous tag
change.

7 years agoavserver: move avserver-specific code from ffmdec.c to avserver.c
Mans Rullgard [Mon, 15 Oct 2012 21:24:41 +0000 (22:24 +0100)]
avserver: move avserver-specific code from ffmdec.c to avserver.c

This way avserver only depends on the data structures of the ffm
demuxer, which it already does, and not also on private functions
being exported by the library.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 16 Oct 2012 12:15:16 +0000 (14:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: simplify linking tools with cmdutils.o
  tiny_psnr: fix range calculation for sample size of 32 bits

Conflicts:
Makefile
tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'
Michael Niedermayer [Tue, 16 Oct 2012 12:04:14 +0000 (14:04 +0200)]
Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
  tiny_psnr: check for specified sample size less than 1
  fate: improve md5sum utility selection
  rangecoder-test: Drop timer output that clutters stderr

Conflicts:
tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
Michael Niedermayer [Tue, 16 Oct 2012 11:57:10 +0000 (13:57 +0200)]
Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'

* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
configure
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools/ffeval: do not use UNIX-specific /dev/std{in,out} files
Stefano Sabatini [Mon, 15 Oct 2012 19:53:35 +0000 (21:53 +0200)]
tools/ffeval: do not use UNIX-specific /dev/std{in,out} files

Should fix behavior when the /dev/ directory is not defined (e.g. on
Windows).

7 years agoexamples: add README file with simple compilation instructions
Stefano Sabatini [Thu, 13 Sep 2012 19:12:56 +0000 (21:12 +0200)]
examples: add README file with simple compilation instructions

7 years agoMerge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'
Michael Niedermayer [Tue, 16 Oct 2012 11:27:19 +0000 (13:27 +0200)]
Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'

* commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f':
  configure: simplify argument handling in check_ld

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4c995fafd861f537360b3717901cdbed6a6844e7'
Michael Niedermayer [Tue, 16 Oct 2012 11:19:11 +0000 (13:19 +0200)]
Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

* commit '4c995fafd861f537360b3717901cdbed6a6844e7':
  configure: simplify get_version() function
  build: support asan and tsan toolchain shortcuts
  rmdec: Move SIPR code shared with Matroska demuxer to a separate file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogitignore: add *.dylib for those of us on Darwin/OS X systems.
Andrew Euell [Tue, 16 Oct 2012 02:14:09 +0000 (04:14 +0200)]
gitignore: add *.dylib for those of us on Darwin/OS X systems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomandelbrot: fix inner=period coloring routine
Michael Niedermayer [Tue, 16 Oct 2012 02:00:55 +0000 (04:00 +0200)]
mandelbrot: fix inner=period coloring routine

Fixes CID717571
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/motion_est: widen before multiply.
Michael Niedermayer [Tue, 16 Oct 2012 01:09:28 +0000 (03:09 +0200)]
x86/motion_est: widen before multiply.

This fixes CID700558, CID700557, CID700556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfenc: explicitly truncate continuity count.
Michael Niedermayer [Mon, 15 Oct 2012 13:58:44 +0000 (15:58 +0200)]
mxfenc: explicitly truncate continuity count.

The field is intended to overflow and have only its low 16bits stored.
This commit avoids the implicit truncation and clarifies that its
intended and not a bug

S326m section 7.6 ("Continuity count"):
> The continuity count word consists of 2 bytes allow-
> ing a number to be created by a modulo 65536
> counter (bits C15 to C0 in figure 7). The continuity
> count shall increment by 1 for each newly transmit-
> ted content package with the same SDTI source and
> destination addresses. The continuity count may
> be used to detect whether the content package
> sequence has been broken by an operation such as
> a routing switch.

Approved-by: Tjoppen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsvideo1enc: fix interframe encoding
Michael Niedermayer [Tue, 16 Oct 2012 00:21:35 +0000 (02:21 +0200)]
msvideo1enc: fix interframe encoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams
Michael Niedermayer [Mon, 15 Oct 2012 23:04:42 +0000 (01:04 +0200)]
ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams

Fixes Ticket1664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutils: consider mpeg4 in mp4/mov to have a unreliable timebase
Michael Niedermayer [Mon, 15 Oct 2012 23:04:02 +0000 (01:04 +0200)]
utils: consider mpeg4 in mp4/mov to have a unreliable timebase

Partly fixes Ticket1664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agora288: assert order to be withinn supported range in do_hybrid_window()
Michael Niedermayer [Mon, 15 Oct 2012 21:51:38 +0000 (23:51 +0200)]
ra288: assert order to be withinn supported range in do_hybrid_window()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsvideo1enc: fix initial keyframe value
Michael Niedermayer [Mon, 15 Oct 2012 21:04:22 +0000 (23:04 +0200)]
msvideo1enc: fix initial keyframe value

keyframe was never set to anything but 1

Fixes CID733730
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: simplify linking tools with cmdutils.o
Mans Rullgard [Mon, 15 Oct 2012 02:59:16 +0000 (03:59 +0100)]
build: simplify linking tools with cmdutils.o

This avoids repeating cmdutils.o in both the prerequisites and
the link command.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agotiny_psnr: fix range calculation for sample size of 32 bits
Mans Rullgard [Sun, 14 Oct 2012 23:21:53 +0000 (00:21 +0100)]
tiny_psnr: fix range calculation for sample size of 32 bits

For a sample size of 32 bits, the shift would overflow producing
undefined results.  Incidentally, in the only test currently using
32-bit samples, the output matches the reference exactly on most
systems meaning the bad 'max' value is never used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agotiny_psnr: check for specified sample size less than 1
Mans Rullgard [Sun, 14 Oct 2012 23:11:44 +0000 (00:11 +0100)]
tiny_psnr: check for specified sample size less than 1

A zero or negative sample size is impossible and should be
reported as an error.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavfi/ass: extend syntax for ass filter
Stefano Sabatini [Mon, 15 Oct 2012 08:06:52 +0000 (10:06 +0200)]
lavfi/ass: extend syntax for ass filter

Make the filter accept named options for the first argument, and update
documentation accordingly.