]> git.sesse.net Git - ffmpeg/log
ffmpeg
11 years agoriff: add SMV2 FourCC for H264
Piotr Bandurski [Sat, 10 Nov 2012 01:11:49 +0000 (02:11 +0100)]
riff: add SMV2 FourCC for H264

sample:

http://samples.mplayerhq.hu/V-codecs/smv2.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 10 Nov 2012 11:44:27 +0000 (12:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: PALIGNR: port to cpuflags
  x86: h264_qpel_10bit: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoAllow forcing a frame size in bytes for image2pipe.
Carl Eugen Hoyos [Sat, 10 Nov 2012 01:25:17 +0000 (02:25 +0100)]
Allow forcing a frame size in bytes for image2pipe.

This allows decoding of concatenated frames encoded in
uncompressed formats like v210.
The frame size cannot be generally calculated, FFmpeg
also supports broken encoders.

Fixes ticket #1869.

11 years agoAdd yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder.
Carl Eugen Hoyos [Sat, 10 Nov 2012 01:19:55 +0000 (02:19 +0100)]
Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder.

Reviewed-by: Paul B Mahol
11 years agopictordec: fill any unset portion of the image
Peter Ross [Fri, 9 Nov 2012 23:31:14 +0000 (10:31 +1100)]
pictordec: fill any unset portion of the image

Fixes ticket #1710

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoriff: add GXVE FourCC for WMV2
Piotr Bandurski [Fri, 9 Nov 2012 23:24:09 +0000 (00:24 +0100)]
riff: add GXVE FourCC for WMV2

sample:

http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoivi_common: check ref_tile size, fix out of array accesses
Michael Niedermayer [Sat, 10 Nov 2012 00:51:40 +0000 (01:51 +0100)]
ivi_common: check ref_tile size, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoivi_common: more MV Checks, fixes out of array reads
Michael Niedermayer [Fri, 9 Nov 2012 22:38:51 +0000 (23:38 +0100)]
ivi_common: more MV Checks, fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoebml_read_binary: use fast_padded_malloc()
Michael Niedermayer [Fri, 9 Nov 2012 21:58:10 +0000 (22:58 +0100)]
ebml_read_binary: use fast_padded_malloc()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: PALIGNR: port to cpuflags
Diego Biurrun [Sat, 7 Jul 2012 23:30:30 +0000 (01:30 +0200)]
x86: PALIGNR: port to cpuflags

11 years agotwinvq: make ibps check unsigned
Michael Niedermayer [Fri, 9 Nov 2012 20:22:12 +0000 (21:22 +0100)]
twinvq: make ibps check unsigned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: h264_qpel_10bit: port to cpuflags
Diego Biurrun [Mon, 30 Jul 2012 15:04:26 +0000 (17:04 +0200)]
x86: h264_qpel_10bit: port to cpuflags

11 years agoiff/ilbm: check remaining buffer size.
Michael Niedermayer [Fri, 9 Nov 2012 19:58:57 +0000 (20:58 +0100)]
iff/ilbm: check remaining buffer size.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agopcmdec: check that channels is valid.
Michael Niedermayer [Fri, 9 Nov 2012 19:47:54 +0000 (20:47 +0100)]
pcmdec: check that channels is valid.

Prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoaacdec: fix temporary array size
Michael Niedermayer [Fri, 9 Nov 2012 19:33:01 +0000 (20:33 +0100)]
aacdec: fix temporary array size

Avoids out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agopngdec: check that format matches too not just dimensions
Michael Niedermayer [Fri, 9 Nov 2012 18:58:37 +0000 (19:58 +0100)]
pngdec: check that format matches too not just dimensions

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotiffdec: check rps, fix infinite loop.
Michael Niedermayer [Fri, 9 Nov 2012 18:28:23 +0000 (19:28 +0100)]
tiffdec: check rps, fix infinite loop.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotwinvq: check bitrate for validity avoid division by 0
Michael Niedermayer [Fri, 9 Nov 2012 17:45:41 +0000 (18:45 +0100)]
twinvq: check bitrate for validity avoid division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovqf: check samplerate, avoid division by 0.
Michael Niedermayer [Fri, 9 Nov 2012 17:04:54 +0000 (18:04 +0100)]
vqf: check samplerate, avoid division by 0.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoiff: avoid out of array reads, due to too many planes.
Michael Niedermayer [Fri, 9 Nov 2012 16:47:51 +0000 (17:47 +0100)]
iff: avoid out of array reads, due to too many planes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoxmv: Fix integer overflow
Michael Niedermayer [Fri, 9 Nov 2012 16:17:37 +0000 (17:17 +0100)]
xmv: Fix integer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovp56dec: Fix handling of alpha configuration changes.
Michael Niedermayer [Fri, 9 Nov 2012 15:58:53 +0000 (16:58 +0100)]
vp56dec: Fix handling of alpha configuration changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavf: Dont compare absolute to relative timestamps in duration gcd
Michael Niedermayer [Fri, 9 Nov 2012 13:54:43 +0000 (14:54 +0100)]
lavf: Dont compare absolute to relative timestamps in duration gcd

This prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoivi_common: dont dereference null pointers.
Michael Niedermayer [Fri, 9 Nov 2012 13:17:17 +0000 (14:17 +0100)]
ivi_common: dont dereference null pointers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoatrac3dec: Check coding mode against channels.
Michael Niedermayer [Fri, 9 Nov 2012 12:26:20 +0000 (13:26 +0100)]
atrac3dec: Check coding mode against channels.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoqdm2: check that coding_method is valid before using it.
Michael Niedermayer [Fri, 9 Nov 2012 12:13:50 +0000 (13:13 +0100)]
qdm2: check that coding_method is valid before using it.

Fixes out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomjpegbdec: dont return a picture when there is no picture.
Michael Niedermayer [Fri, 9 Nov 2012 11:43:51 +0000 (12:43 +0100)]
mjpegbdec: dont return a picture when there is no picture.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotiffdec: check count in metadata reading.
Michael Niedermayer [Fri, 9 Nov 2012 11:13:30 +0000 (12:13 +0100)]
tiffdec: check count in metadata reading.

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotiffdec: use checked reads for tget*()
Michael Niedermayer [Fri, 9 Nov 2012 11:03:57 +0000 (12:03 +0100)]
tiffdec: use checked reads for tget*()

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 9 Nov 2012 09:29:51 +0000 (10:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flacenc: ensure the order is within the min/max range in LPC order search
  avconv: rescale packet duration to muxer time base when flushing encoders
  add 24-bit FLAC encoding to Changelog
  rtpenc_aac: Fix calculation of the header size
  x86: h264_intrapred: port to cpuflags

Conflicts:
Changelog
libavformat/rtpenc_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoPRINT_CODEC_SUPPORTED: fix used variable
Michael Niedermayer [Sun, 21 Oct 2012 23:04:14 +0000 (01:04 +0200)]
PRINT_CODEC_SUPPORTED: fix used variable

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/faq: explain libfoo-dev packages.
Nicolas George [Wed, 7 Nov 2012 22:55:17 +0000 (23:55 +0100)]
doc/faq: explain libfoo-dev packages.

11 years agoflacenc: ensure the order is within the min/max range in LPC order search
Justin Ruggles [Wed, 7 Nov 2012 19:48:28 +0000 (14:48 -0500)]
flacenc: ensure the order is within the min/max range in LPC order search

This fixes use of uninitialized values when the FLAC encoder uses the
2-level, 4-level, and 8-level search methods. Fixes failure of the
fate-flac-24-comp-8 test when run using valgrind.

11 years agoavconv: rescale packet duration to muxer time base when flushing encoders
Justin Ruggles [Tue, 6 Nov 2012 19:24:31 +0000 (14:24 -0500)]
avconv: rescale packet duration to muxer time base when flushing encoders

Fixes Bug 385

11 years agoadd 24-bit FLAC encoding to Changelog
Justin Ruggles [Mon, 5 Nov 2012 20:36:19 +0000 (15:36 -0500)]
add 24-bit FLAC encoding to Changelog

Also move a misplaced line from the 9_beta2 section to <next>

11 years agortpenc_aac: Fix calculation of the header size
Luca Abeni [Thu, 8 Nov 2012 00:38:50 +0000 (01:38 +0100)]
rtpenc_aac: Fix calculation of the header size

Previously the high end byte was always set to zero. Also get
rid of an unnecessary multiplication (which in practice couldn't
overflow) before shifting.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agoframe_thread_encoder: silence integer to pointer without cast warning
Michael Niedermayer [Thu, 8 Nov 2012 17:25:24 +0000 (18:25 +0100)]
frame_thread_encoder: silence integer to pointer without cast warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: h264_intrapred: port to cpuflags
Diego Biurrun [Mon, 9 Jul 2012 22:04:18 +0000 (00:04 +0200)]
x86: h264_intrapred: port to cpuflags

11 years agosctp: silence const warning
Michael Niedermayer [Thu, 8 Nov 2012 15:06:04 +0000 (16:06 +0100)]
sctp: silence const warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffmdec: remove unused variable
Michael Niedermayer [Thu, 8 Nov 2012 14:54:14 +0000 (15:54 +0100)]
ffmdec: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibopencore-amr: fix av_log() argument
Michael Niedermayer [Thu, 8 Nov 2012 14:46:51 +0000 (15:46 +0100)]
libopencore-amr: fix av_log() argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 8 Nov 2012 07:07:05 +0000 (08:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvpxenc: Allow enabling constrained quality (CQ) mode

Conflicts:
configure
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agortpenc_aac: Fix 10l bug
Luca Abeni [Thu, 8 Nov 2012 00:38:50 +0000 (01:38 +0100)]
rtpenc_aac: Fix 10l bug

Fixes CID602564
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/faq: replace @file by @command for "ffmpeg".
Nicolas George [Wed, 7 Nov 2012 22:45:12 +0000 (23:45 +0100)]
doc/faq: replace @file by @command for "ffmpeg".

11 years agodoc/libavcodec: hint to where to find the Git history
Alexander Strasser [Mon, 5 Nov 2012 22:51:06 +0000 (23:51 +0100)]
doc/libavcodec: hint to where to find the Git history

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
11 years agodoc/Makefile: change DOCLIBS check
Stefano Sabatini [Wed, 7 Nov 2012 22:11:02 +0000 (23:11 +0100)]
doc/Makefile: change DOCLIBS check

More consistent with the rest of the build system, and more compact.

11 years agolavu: remove disabled FF_API_OLD_EVAL_NAMES code
Stefano Sabatini [Sun, 4 Nov 2012 11:01:22 +0000 (12:01 +0100)]
lavu: remove disabled FF_API_OLD_EVAL_NAMES code

11 years agolavu/opt: show valid range in case of out-of-range value
Stefano Sabatini [Sun, 4 Nov 2012 14:38:35 +0000 (15:38 +0100)]
lavu/opt: show valid range in case of out-of-range value

Improve feedback.

11 years agolibvpxenc: Allow enabling constrained quality (CQ) mode
James Zern [Tue, 12 Apr 2011 00:00:35 +0000 (17:00 -0700)]
libvpxenc: Allow enabling constrained quality (CQ) mode

The CQ mode was introduced in libvpx 0.9.6.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agoFix the packet duration when flushing the encoder.
Thierry Foucu [Wed, 7 Nov 2012 19:33:41 +0000 (11:33 -0800)]
Fix the packet duration when flushing the encoder.

A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate-rsync: replace -a by -rlt
Michael Niedermayer [Tue, 6 Nov 2012 13:45:51 +0000 (14:45 +0100)]
fate-rsync: replace -a by -rlt

This remove the owner, group and permission preservation on fatesample checkouts
These caused problems for durandal_1707

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agogsm_parser: fix infinite loop
Michael Niedermayer [Wed, 7 Nov 2012 16:51:59 +0000 (17:51 +0100)]
gsm_parser: fix infinite loop

Fixes Ticket1894
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoadpcm: improve smjpeg decoding
Paul B Mahol [Wed, 7 Nov 2012 03:22:27 +0000 (03:22 +0000)]
adpcm: improve smjpeg decoding

Previous version had significant artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agowtvenc: produce seekable files
Peter Ross [Wed, 7 Nov 2012 05:52:33 +0000 (16:52 +1100)]
wtvenc: produce seekable files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowtvenc: simplify write_timestamp
Peter Ross [Wed, 7 Nov 2012 05:52:21 +0000 (16:52 +1100)]
wtvenc: simplify write_timestamp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows...
Peter Ross [Wed, 7 Nov 2012 05:52:12 +0000 (16:52 +1100)]
wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowtvenc: indent fixup
Peter Ross [Wed, 7 Nov 2012 05:52:01 +0000 (16:52 +1100)]
wtvenc: indent fixup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not...
Peter Ross [Wed, 7 Nov 2012 05:51:51 +0000 (16:51 +1100)]
wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1dec: propagate return code from ffv1_common_init()
Michael Niedermayer [Wed, 7 Nov 2012 12:27:01 +0000 (13:27 +0100)]
ffv1dec: propagate return code from ffv1_common_init()

Fixes Ticket1824
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1dec: more completely check slice count
Michael Niedermayer [Wed, 7 Nov 2012 12:26:37 +0000 (13:26 +0100)]
ffv1dec: more completely check slice count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Nov 2012 09:23:58 +0000 (10:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopencore-amr: Check the return value of amr_decode_fix_avctx

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosmjpegenc: use bits_per_coded_sample instead of calling function
Paul B Mahol [Wed, 7 Nov 2012 01:29:07 +0000 (01:29 +0000)]
smjpegenc: use bits_per_coded_sample instead of calling function

Final result is same and this allows support of multiple values per codec.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agokgv1dec: fix end condition
Michael Niedermayer [Wed, 7 Nov 2012 00:42:11 +0000 (01:42 +0100)]
kgv1dec: fix end condition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibopencore-amr: Check the return value of amr_decode_fix_avctx
Martin Storsjö [Tue, 6 Nov 2012 10:18:57 +0000 (12:18 +0200)]
libopencore-amr: Check the return value of amr_decode_fix_avctx

This allows getting rid of redundant checks later in the codec
specific init functions.

Move the check to before actually initializing the decoder lib,
to simplify error handling.

This fixes a case of returning a value from a void function, present since
d40dab907.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agolavfi/movie: return proper error code in case of av_get_token() allocation failure
Stefano Sabatini [Tue, 6 Nov 2012 22:28:43 +0000 (23:28 +0100)]
lavfi/movie: return proper error code in case of av_get_token() allocation failure

Also slightly clarify logic, and should fix coverity issue CID 717771.

11 years agoffprobe: fix potential NULL pointer dereference
Stefano Sabatini [Tue, 6 Nov 2012 21:59:24 +0000 (22:59 +0100)]
ffprobe: fix potential NULL pointer dereference

Found by Coverity, should fix CID 733741.

11 years agolavfi/showwaves: return error in case of allocation failure in filter_samples()
Stefano Sabatini [Tue, 6 Nov 2012 21:48:54 +0000 (22:48 +0100)]
lavfi/showwaves: return error in case of allocation failure in filter_samples()

11 years agolavfi/showwaves: simplify check in filter_samples()
Stefano Sabatini [Tue, 6 Nov 2012 21:43:51 +0000 (22:43 +0100)]
lavfi/showwaves: simplify check in filter_samples()

Also fix Coverity issue CID 733743: Dereference after null check

11 years agosbgdec: dont set slide to a uninitialized value
Nicolas George [Tue, 6 Nov 2012 20:14:45 +0000 (21:14 +0100)]
sbgdec: dont set slide to a uninitialized value

Fixed CID703833
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovf_drawbox: dont move uninitialized and then unused colors around
Michael Niedermayer [Tue, 6 Nov 2012 20:40:23 +0000 (21:40 +0100)]
vf_drawbox: dont move uninitialized and then unused colors around

Fixes CID741419
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoutils: fix integer overflow with DURATION_MAX_READ_SIZE
Michael Niedermayer [Tue, 6 Nov 2012 17:44:14 +0000 (18:44 +0100)]
utils: fix integer overflow with DURATION_MAX_READ_SIZE

Fixes CID703746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: add PMP demuxer test
Paul B Mahol [Mon, 5 Nov 2012 12:26:39 +0000 (12:26 +0000)]
fate: add PMP demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agowavpack: check if number of samples is not too big
Paul B Mahol [Tue, 6 Nov 2012 13:03:48 +0000 (13:03 +0000)]
wavpack: check if number of samples is not too big

Wavpack format documentation mentions that 131072 is
max number of samples.

This fixes huge memory allocations in sample from ticket #1889.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agowtv: move duplicated guids into wtv.c
Peter Ross [Tue, 6 Nov 2012 03:01:42 +0000 (14:01 +1100)]
wtv: move duplicated guids into wtv.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT
Peter Ross [Tue, 6 Nov 2012 03:01:35 +0000 (14:01 +1100)]
wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowtvenc: fix typo
Peter Ross [Tue, 6 Nov 2012 03:01:27 +0000 (14:01 +1100)]
wtvenc: fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Nov 2012 14:11:53 +0000 (15:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: atrac: Place atrac1 and atrac3 tests in different groups
  fate: aac: cosmetics: Group AAC LATM tests together
  x86: avresample: Add missing colons to assembly labels

Conflicts:
tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowavpack: use more meaningful error codes
Paul B Mahol [Tue, 6 Nov 2012 12:56:44 +0000 (12:56 +0000)]
wavpack: use more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agofate: atrac: Place atrac1 and atrac3 tests in different groups
Diego Biurrun [Fri, 19 Oct 2012 23:09:33 +0000 (01:09 +0200)]
fate: atrac: Place atrac1 and atrac3 tests in different groups

11 years agofate: aac: cosmetics: Group AAC LATM tests together
Diego Biurrun [Sat, 20 Oct 2012 10:19:54 +0000 (12:19 +0200)]
fate: aac: cosmetics: Group AAC LATM tests together

11 years ago.gitignore: ignore *.3 files as well
Stefano Sabatini [Tue, 6 Nov 2012 11:24:12 +0000 (12:24 +0100)]
.gitignore: ignore *.3 files as well

11 years agodoc/Makefile: remove .3 file with make clean
Stefano Sabatini [Tue, 6 Nov 2012 11:23:13 +0000 (12:23 +0100)]
doc/Makefile: remove .3 file with make clean

11 years agox86: avresample: Add missing colons to assembly labels
Diego Biurrun [Tue, 6 Nov 2012 11:07:35 +0000 (12:07 +0100)]
x86: avresample: Add missing colons to assembly labels

YASM accepts labels without colons, but NASM issues warnings.

11 years agodoc/libavcodec: do not say multimedia streams in the title
Alexander Strasser [Mon, 5 Nov 2012 22:50:42 +0000 (23:50 +0100)]
doc/libavcodec: do not say multimedia streams in the title

The mention of multimedia stream sounds more like multiple
elementary media streams like video and audio multiplexed
into a multimedia container format.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agodoc/libavcodec: improve wording in description
Alexander Strasser [Mon, 5 Nov 2012 22:50:24 +0000 (23:50 +0100)]
doc/libavcodec: improve wording in description

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agodoc/ffserver: fix typos/reword paragraphs about FFM versions
Stefano Sabatini [Tue, 6 Nov 2012 10:35:14 +0000 (11:35 +0100)]
doc/ffserver: fix typos/reword paragraphs about FFM versions

11 years agoexamples/muxing: fix typo: allocated -> allocate
Stefano Sabatini [Tue, 6 Nov 2012 10:28:28 +0000 (11:28 +0100)]
examples/muxing: fix typo: allocated -> allocate

11 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 6 Nov 2012 03:02:36 +0000 (04:02 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: adjust external clock speed based on buffer fullness for realtime sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoimg2enc: support 16bit per sample yuv in split planes.
Michael Niedermayer [Tue, 6 Nov 2012 01:27:04 +0000 (02:27 +0100)]
img2enc: support 16bit per sample yuv in split planes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMAINTAINERS: fix entry for img2
Michael Niedermayer [Tue, 6 Nov 2012 00:46:21 +0000 (01:46 +0100)]
MAINTAINERS: fix entry for img2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoimg2enc: support storing alpha planes too in split plane mode
Michael Niedermayer [Tue, 6 Nov 2012 00:42:26 +0000 (01:42 +0100)]
img2enc: support storing alpha planes too in split plane mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoimg2enc: Fix yuva with yuv split planes.
Michael Niedermayer [Tue, 6 Nov 2012 00:27:09 +0000 (01:27 +0100)]
img2enc: Fix yuva with yuv split planes.

Previously the chroma planes where corrupted in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoimg2enc: check pix_fmt for split planes mode.
Michael Niedermayer [Tue, 6 Nov 2012 00:25:59 +0000 (01:25 +0100)]
img2enc: check pix_fmt for split planes mode.

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoimg2enc: ensure that the codec is rawvideo for split planes mode.
Michael Niedermayer [Tue, 6 Nov 2012 00:13:12 +0000 (01:13 +0100)]
img2enc: ensure that the codec is rawvideo for split planes mode.

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoexamples/demuxing: fix braino
Stefano Sabatini [Tue, 6 Nov 2012 00:06:35 +0000 (01:06 +0100)]
examples/demuxing: fix braino

s/video/audio/ in a log message.

11 years agoexamples/demuxing: dump input information *after* trying to open audio stream
Stefano Sabatini [Tue, 6 Nov 2012 00:05:14 +0000 (01:05 +0100)]
examples/demuxing: dump input information *after* trying to open audio stream

Implement more logical code flow.

11 years agofate: add more pix_fmt tests for xwd
Paul B Mahol [Mon, 5 Nov 2012 20:34:13 +0000 (20:34 +0000)]
fate: add more pix_fmt tests for xwd

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 5 Nov 2012 22:00:23 +0000 (23:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a 24-bit FLAC encoding test
  FATE: rename FLAC tests from flac-* to flac-16-*
  flacenc: use RICE2 entropy coding mode for 24-bit
  flacenc: add 24-bit encoding
  flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
Michael Niedermayer [Mon, 5 Nov 2012 21:51:20 +0000 (22:51 +0100)]
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '930e26a3ea9d223e04bac4cdde13697cec770031'
Michael Niedermayer [Mon, 5 Nov 2012 21:36:05 +0000 (22:36 +0100)]
Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
  x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
  x86: PABSW: port to cpuflags
  x86: vc1dsp: port to cpuflags
  rtmp: Use av_strlcat instead of strncat

Conflicts:
libavcodec/x86/h264_qpel.c

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