ffmpeg.git
8 years agoswscale: alpha less rgb32 support.
Michael Niedermayer [Mon, 28 Nov 2011 01:50:21 +0000 (02:50 +0100)]
swscale: alpha less rgb32 support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopixfmt: Add 32bit rgb without alpha formats
Michael Niedermayer [Mon, 28 Nov 2011 01:44:05 +0000 (02:44 +0100)]
pixfmt: Add 32bit rgb without alpha formats

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

* qatar/master:
  vc1: use an enum for Frame Coding Mode
  doc: cleanup filter section
  indeo3: error out if no motion vector is set.
  x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
  mpegaudio: do not use init_static_data() for initializing tables.
  musepack: fix signed shift overflow in mpc_read_packet()
  mov: Make format string match variable type.
  wmavoice: Make format string match variable type.
  vc1: select interlaced scan table by FCM element
  Generalize RIFF INFO tag support; support reading INFO tag in wav
  pthread: track thread existence in a separate variable.

Conflicts:
doc/filters.texi
libavcodec/pthread.c
libavformat/avi.c
libavformat/riff.c
libavformat/riff.h
libavformat/wav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1: use an enum for Frame Coding Mode
Luca Barbato [Sat, 26 Nov 2011 12:28:48 +0000 (13:28 +0100)]
vc1: use an enum for Frame Coding Mode

Document it a little and possibly fix a bug in dxva2_vc1.

8 years agodoc: cleanup filter section
Luca Barbato [Fri, 25 Nov 2011 15:03:16 +0000 (16:03 +0100)]
doc: cleanup filter section

Use the @command{} tag when needed and cleanup the examples.

8 years agox86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
Vitor Sessak [Sun, 27 Nov 2011 14:41:56 +0000 (15:41 +0100)]
x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.

Without this, code like "shufps m0, m1, m2, 0xaa" would not work in CPUs
not supporting SSE2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo3: error out if no motion vector is set.
Aneesh Dogra [Sun, 27 Nov 2011 20:56:52 +0000 (02:26 +0530)]
indeo3: error out if no motion vector is set.

This fixes a crash on a corrupt bitstream (bugzilla #93).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agox86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
Vitor Sessak [Sun, 27 Nov 2011 14:41:56 +0000 (15:41 +0100)]
x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.

Without this, code like "shufps m0, m1, m2, 0xaa" would not work in CPUs
not supporting SSE2.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoaacenc: make the aac coder user choosable.
Michael Niedermayer [Sun, 27 Nov 2011 20:19:30 +0000 (21:19 +0100)]
aacenc: make the aac coder user choosable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacenc: add AAC_CODER_NB
Michael Niedermayer [Sun, 27 Nov 2011 20:19:07 +0000 (21:19 +0100)]
aacenc: add AAC_CODER_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocmdutils: pass AVCodec to filter_codec_opts()
Michael Niedermayer [Sun, 27 Nov 2011 20:17:56 +0000 (21:17 +0100)]
cmdutils: pass AVCodec to filter_codec_opts()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegaudio: do not use init_static_data() for initializing tables.
Justin Ruggles [Sun, 27 Nov 2011 18:07:19 +0000 (13:07 -0500)]
mpegaudio: do not use init_static_data() for initializing tables.

It is called once for each mpegaudio codec that is registered, which adds
significant overhead.

8 years agoimg2: update first file only when -updatefirst is specified
Michael Niedermayer [Sun, 27 Nov 2011 15:17:10 +0000 (16:17 +0100)]
img2: update first file only when -updatefirst is specified

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotta: better check for totalframes.
Michael Niedermayer [Sun, 27 Nov 2011 14:37:15 +0000 (15:37 +0100)]
tta: better check for totalframes.
Avoids crash, Fixes Ticket 690

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoimg2: Allow writing multiple files onto the same output file.
Michael Niedermayer [Sun, 27 Nov 2011 14:07:49 +0000 (15:07 +0100)]
img2: Allow writing multiple files onto the same output file.
Fixes Ticket687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomusepack: fix signed shift overflow in mpc_read_packet()
Mans Rullgard [Sun, 27 Nov 2011 10:29:33 +0000 (10:29 +0000)]
musepack: fix signed shift overflow in mpc_read_packet()

Using an unsigned variable avoids problems with overflows.
There is further no need for a 64-bit intermediate here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agopthread: check pthread_create() return value.
Michael Niedermayer [Sun, 27 Nov 2011 05:17:03 +0000 (06:17 +0100)]
pthread: check pthread_create() return value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthread: next try on freeing threads without crashing.
Michael Niedermayer [Sun, 27 Nov 2011 04:55:20 +0000 (05:55 +0100)]
pthread: next try on freeing threads without crashing.
This should fix mingw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: Make format string match variable type.
Alex Converse [Sun, 27 Nov 2011 03:41:54 +0000 (19:41 -0800)]
mov: Make format string match variable type.

8 years agowmavoice: Make format string match variable type.
Alex Converse [Sun, 27 Nov 2011 03:40:34 +0000 (19:40 -0800)]
wmavoice: Make format string match variable type.

8 years agovc1: select interlaced scan table by FCM element
Kostya Shishkov [Sat, 26 Nov 2011 12:23:39 +0000 (13:23 +0100)]
vc1: select interlaced scan table by FCM element

Interlaced videos can contain progressive frames too and now wrong scantable
is selected for them.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoHAM6/HAM8 support for IFF ACBM decoder
Peter Ross [Sun, 27 Nov 2011 01:10:38 +0000 (12:10 +1100)]
HAM6/HAM8 support for IFF ACBM decoder

Based on patch by ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoiff: fix invalid reads (ticket 689)
Peter Ross [Sun, 27 Nov 2011 01:07:47 +0000 (12:07 +1100)]
iff: fix invalid reads (ticket 689)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoGeneralize RIFF INFO tag support; support reading INFO tag in wav
Victor Vasiliev [Thu, 24 Nov 2011 20:02:43 +0000 (00:02 +0400)]
Generalize RIFF INFO tag support; support reading INFO tag in wav

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agopthread: track thread existence in a separate variable.
Cheng Sun [Sun, 27 Nov 2011 00:36:50 +0000 (16:36 -0800)]
pthread: track thread existence in a separate variable.

This fixes a compile error on mingw32 when using p->thread
directly (as if it were a pointer) to track thread existence,
because the type is opaque and may be a non-pointer.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agovc1: select interlaced scan table by FCM element
Kostya Shishkov [Sat, 26 Nov 2011 12:23:39 +0000 (13:23 +0100)]
vc1: select interlaced scan table by FCM element

Interlaced videos can contain progressive frames too and now wrong scantable
is selected for them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 26 Nov 2011 23:30:13 +0000 (00:30 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (42 commits)
  swscale: fix signed overflow in yuv2mono_X_c_template
  snow: fix integer overflows
  svq1enc: remove stale altivec-related hack
  snow: fix signed overflow in byte to 32-bit replication
  adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
  avformat: add CRI ADX format demuxer
  adx: add an ADX parser.
  adx: move header decoding to ADX common code
  adx: calculate the number of blocks in a packet
  adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
  adx: check for unsupported ADX formats
  adx: simplify encoding by using put_sbits()
  adx: calculate correct LPC coeffs
  adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
  adx: simplify adx_decode() by using get_sbits() to read residual samples
  adx: fix the data offset parsing in adx_decode_header()
  adx: remove unneeded post-decode channel interleaving
  adx: validate header values
  adx: cosmetics: general pretty-printing and comment clean-up
  adx: remove useless comments
  ...

Conflicts:
Changelog
libavcodec/cook.c
libavcodec/fraps.c
libavcodec/nuv.c
libavcodec/pthread.c
libavcodec/version.h
libavformat/Makefile
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: fix signed overflow in yuv2mono_X_c_template
Mans Rullgard [Sat, 26 Nov 2011 21:53:00 +0000 (21:53 +0000)]
swscale: fix signed overflow in yuv2mono_X_c_template

As old bits are shifted out of the accumulator, they cause signed
overflows when they reach the end.  Making the variable unsigned fixes
this.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosnow: fix integer overflows
Mans Rullgard [Sat, 26 Nov 2011 20:59:17 +0000 (20:59 +0000)]
snow: fix integer overflows

The way these values are used, they should have an unsigned type.
A similar change was made for mpegvideo in cb66847.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosvq1enc: remove stale altivec-related hack
Mans Rullgard [Sat, 26 Nov 2011 20:44:37 +0000 (20:44 +0000)]
svq1enc: remove stale altivec-related hack

altivec.h is no longer (indirectly) included, so this hack is not
needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosnow: fix signed overflow in byte to 32-bit replication
Mans Rullgard [Sat, 26 Nov 2011 20:42:07 +0000 (20:42 +0000)]
snow: fix signed overflow in byte to 32-bit replication

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: enable new sbr tests after our rsync server has them now.
Michael Niedermayer [Sat, 26 Nov 2011 21:09:07 +0000 (22:09 +0100)]
fate: enable new sbr tests after our rsync server has them now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1: Fix pic_header_flag=0 (SA10143.vc1)
Michael Niedermayer [Sat, 26 Nov 2011 20:59:56 +0000 (21:59 +0100)]
vc1: Fix pic_header_flag=0 (SA10143.vc1)
Bug introduced in:
commit 4509be3d2f46a52ada8e2ecb476faed93e19abf3
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Oct 11 11:56:42 2011 +0200

    vc1: reset interlaced variables, prevent another bunch of crashes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoadx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
Justin Ruggles [Sat, 26 Nov 2011 22:00:00 +0000 (17:00 -0500)]
adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()

It is used by the ADX decoder, and therefore needs to be exported in order to
work with shared libs.

8 years agoavformat: add CRI ADX format demuxer
Justin Ruggles [Mon, 21 Nov 2011 07:34:18 +0000 (02:34 -0500)]
avformat: add CRI ADX format demuxer

8 years agoadx: add an ADX parser.
Justin Ruggles [Mon, 21 Nov 2011 06:49:37 +0000 (01:49 -0500)]
adx: add an ADX parser.

This simplifies the decoder so it doesn't have to process an in-packet header
or handle arbitrary-sized packets. It also fixes decoding of files with large
headers.

8 years agoadx: move header decoding to ADX common code
Justin Ruggles [Mon, 21 Nov 2011 01:16:05 +0000 (20:16 -0500)]
adx: move header decoding to ADX common code

8 years agoadx: calculate the number of blocks in a packet
Justin Ruggles [Sun, 20 Nov 2011 22:53:43 +0000 (17:53 -0500)]
adx: calculate the number of blocks in a packet

8 years agoadx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
Justin Ruggles [Sun, 20 Nov 2011 22:50:46 +0000 (17:50 -0500)]
adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES

8 years agoadx: check for unsupported ADX formats
Justin Ruggles [Sun, 20 Nov 2011 22:07:59 +0000 (17:07 -0500)]
adx: check for unsupported ADX formats

8 years agoadx: simplify encoding by using put_sbits()
Justin Ruggles [Sun, 20 Nov 2011 21:49:13 +0000 (16:49 -0500)]
adx: simplify encoding by using put_sbits()

8 years agoadx: calculate correct LPC coeffs
Justin Ruggles [Sun, 20 Nov 2011 19:21:32 +0000 (14:21 -0500)]
adx: calculate correct LPC coeffs

Instead of using fixed coefficients, the correct way is to calculate the
coefficients using the highpass cutoff frequency from the ADX stream header
and the sample rate.

8 years agoadx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
Justin Ruggles [Sun, 20 Nov 2011 19:03:21 +0000 (14:03 -0500)]
adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow

8 years agoadx: simplify adx_decode() by using get_sbits() to read residual samples
Justin Ruggles [Sun, 20 Nov 2011 18:06:32 +0000 (13:06 -0500)]
adx: simplify adx_decode() by using get_sbits() to read residual samples

8 years agoadx: fix the data offset parsing in adx_decode_header()
Justin Ruggles [Sun, 20 Nov 2011 17:57:21 +0000 (12:57 -0500)]
adx: fix the data offset parsing in adx_decode_header()

first 2 bytes are 0x80, 0x00. offset is only 16-bit.
this is according to format descriptions on multimedia wiki and wikipedia.

8 years agoadx: remove unneeded post-decode channel interleaving
Justin Ruggles [Sun, 20 Nov 2011 17:46:41 +0000 (12:46 -0500)]
adx: remove unneeded post-decode channel interleaving

instead interleave channels while decoding

8 years agoadx: validate header values
Justin Ruggles [Sat, 19 Nov 2011 22:51:36 +0000 (17:51 -0500)]
adx: validate header values

8 years agoadx: cosmetics: general pretty-printing and comment clean-up
Justin Ruggles [Sat, 19 Nov 2011 22:46:15 +0000 (17:46 -0500)]
adx: cosmetics: general pretty-printing and comment clean-up

8 years agoadx: remove useless comments
Justin Ruggles [Sat, 19 Nov 2011 22:07:46 +0000 (17:07 -0500)]
adx: remove useless comments

8 years agoadx: change short to int16_t
Justin Ruggles [Sat, 19 Nov 2011 22:06:45 +0000 (17:06 -0500)]
adx: change short to int16_t

8 years agoadx: rename struct PREV to ADXChannelState
Justin Ruggles [Sat, 19 Nov 2011 22:05:44 +0000 (17:05 -0500)]
adx: rename struct PREV to ADXChannelState

8 years agodnxhdenc: fix signed overflows
Mans Rullgard [Sat, 26 Nov 2011 20:11:12 +0000 (20:11 +0000)]
dnxhdenc: fix signed overflows

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agodv: simplify bitstream splicing in dv_decode_ac()
Mans Rullgard [Sat, 26 Nov 2011 18:48:16 +0000 (18:48 +0000)]
dv: simplify bitstream splicing in dv_decode_ac()

This is simpler and fixes some overflow checker warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agos3tc: fix shift overflow by using unsigned constant
Mans Rullgard [Sat, 26 Nov 2011 16:51:44 +0000 (16:51 +0000)]
s3tc: fix shift overflow by using unsigned constant

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosvq1enc: fix signed multiplication overflow
Mans Rullgard [Sat, 26 Nov 2011 16:50:51 +0000 (16:50 +0000)]
svq1enc: fix signed multiplication overflow

This multiplication can overflow the signed range but not the
unsigned.  After right-shifting it will thus fit in the signed
range again.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosvq1dec: use sign_extend()
Mans Rullgard [Sat, 26 Nov 2011 15:16:29 +0000 (15:16 +0000)]
svq1dec: use sign_extend()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agorv34: fix signed multiplication overflow
Mans Rullgard [Sat, 26 Nov 2011 14:50:23 +0000 (14:50 +0000)]
rv34: fix signed multiplication overflow

Multiply by unsigned 0x01010101 to replicate bytes into 32-bit
word.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years ago[PATCH] Fix crash when initializing multi-threaded decoding for corrupted file.
Cheng Sun [Sat, 26 Nov 2011 18:45:36 +0000 (10:45 -0800)]
[PATCH] Fix crash when initializing multi-threaded decoding for corrupted file.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoavfilter: fix AVFilterPad video only comment.
Clément Bœsch [Sat, 26 Nov 2011 18:30:22 +0000 (19:30 +0100)]
avfilter: fix AVFilterPad video only comment.

8 years agolavfi-showfiltfmts.c: fix handling of null names
Michael Niedermayer [Sat, 26 Nov 2011 17:12:07 +0000 (18:12 +0100)]
lavfi-showfiltfmts.c: fix handling of null names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthreads: fix segfault due to the thread beimg killed before it has been allocated
Michael Niedermayer [Sat, 26 Nov 2011 16:55:01 +0000 (17:55 +0100)]
pthreads: fix segfault due to the thread beimg killed before it has been allocated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacdec: Fix Sound fragments after seeking
kaptnole [Sat, 26 Nov 2011 13:37:39 +0000 (14:37 +0100)]
aacdec: Fix Sound fragments after seeking
Fixes Ticket420

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoopt_pix_fmts: try to fix segfault on open solaris
Michael Niedermayer [Sat, 26 Nov 2011 12:16:43 +0000 (13:16 +0100)]
opt_pix_fmts: try to fix segfault on open solaris

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosol: use AV_RL32 instead of raw pointer cast
Mans Rullgard [Sat, 26 Nov 2011 00:22:28 +0000 (00:22 +0000)]
sol: use AV_RL32 instead of raw pointer cast

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agocook: use a table for xor key rotation
Mans Rullgard [Fri, 25 Nov 2011 20:43:05 +0000 (20:43 +0000)]
cook: use a table for xor key rotation

This is simpler and avoids an invalid shift by 32 in the
aligned case.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoapedec: fix signed integer overflows
Mans Rullgard [Fri, 25 Nov 2011 18:46:35 +0000 (18:46 +0000)]
apedec: fix signed integer overflows

This bit manipulation is equivalent but avoids undefined
shifts and overflows.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoqtrle: simplify 32-bit decode using intreadwrite macros
Mans Rullgard [Fri, 25 Nov 2011 18:16:44 +0000 (18:16 +0000)]
qtrle: simplify 32-bit decode using intreadwrite macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agogif: fix invalid signed shifts
Mans Rullgard [Fri, 25 Nov 2011 17:51:10 +0000 (17:51 +0000)]
gif: fix invalid signed shifts

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavfi: add libass based subtitles renderer
Stefano Sabatini [Sat, 17 Sep 2011 13:52:19 +0000 (15:52 +0200)]
lavfi: add libass based subtitles renderer

8 years agortjpeg: simplify get_block() by using get_bits_left.
Reimar Döffinger [Sat, 5 Nov 2011 21:07:22 +0000 (22:07 +0100)]
rtjpeg: simplify get_block() by using get_bits_left.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agortjpeg: check get_block return value for error.
Reimar Döffinger [Sat, 5 Nov 2011 21:26:42 +0000 (22:26 +0100)]
rtjpeg: check get_block return value for error.

This avoids crashes due to reading out-of-bounds.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agonuv: check per-frame header for validity.
Reimar Döffinger [Sat, 5 Nov 2011 22:13:07 +0000 (23:13 +0100)]
nuv: check per-frame header for validity.

Since it contains dimensions parsing an invalid one has rather
annoying effects.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agonuv: use FFALIGN.
Reimar Döffinger [Sat, 5 Nov 2011 20:11:37 +0000 (21:11 +0100)]
nuv: use FFALIGN.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoflicvideo: check extradata_size before accessing extradata.
Carl Eugen Hoyos [Wed, 9 Nov 2011 13:04:22 +0000 (14:04 +0100)]
flicvideo: check extradata_size before accessing extradata.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agofraps: check for overread.
Michael Niedermayer [Wed, 9 Nov 2011 18:40:59 +0000 (19:40 +0100)]
fraps: check for overread.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agocook: fix apparent typo in extradata parsing
K.Y.H [Thu, 10 Nov 2011 23:30:39 +0000 (00:30 +0100)]
cook: fix apparent typo in extradata parsing

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc: update doxy to use nondeprecated API.
Anton Khirnov [Fri, 18 Nov 2011 10:16:23 +0000 (11:16 +0100)]
lavc: update doxy to use nondeprecated API.

8 years agoswscale: remove duplicate code from yesterdays merge.
Michael Niedermayer [Sat, 26 Nov 2011 00:20:06 +0000 (01:20 +0100)]
swscale: remove duplicate code from yesterdays merge.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 26 Nov 2011 00:12:08 +0000 (01:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: sort entries
Stefano Sabatini [Fri, 25 Nov 2011 17:17:07 +0000 (18:17 +0100)]
configure: sort entries

8 years agovc1dec: fix scantable for advanced P frames
Michael Niedermayer [Fri, 25 Nov 2011 22:11:03 +0000 (23:11 +0100)]
vc1dec: fix scantable for advanced P frames
Fixes: vc1 file from Ticket606
Fixes: vc1+vc1+++artifacts*.vc1
Fixes: mpeg+vc1+++salxxos.evo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1dec: fix 10l typo
Michael Niedermayer [Fri, 25 Nov 2011 21:46:17 +0000 (22:46 +0100)]
vc1dec: fix 10l typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1dec: drop damaged B frames
Michael Niedermayer [Fri, 25 Nov 2011 19:55:25 +0000 (20:55 +0100)]
vc1dec: drop damaged B frames
Fixes: vc1_error_spilt.avi of Ticket606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1dec: fix used ER flags in vc1_decode_b_blocks()
Michael Niedermayer [Fri, 25 Nov 2011 19:54:57 +0000 (20:54 +0100)]
vc1dec: fix used ER flags in vc1_decode_b_blocks()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Readd #define _SVID_SOURCE
Martin Storsjö [Thu, 24 Nov 2011 22:45:16 +0000 (00:45 +0200)]
swscale: Readd #define _SVID_SOURCE

This was removed erroneously in
046f081b46c8479820409cf8f530b988221bd15b. This define still is
necessary for getting MAP_ANONYMOUS defined on linux/glibc,
despite the define reshuffling done in that commit.

Without MAP_ANONYMOUS defined, the mprotect calls for setting the
generated mmx2 scaler code pages executable are left out, causing
crashes if that codepath is chosen.

This patch fixes scaling from 192x144 to 320x240 with
-sws_flags fast_bilinear, which crashes on linux at the
moment.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoindeo3: out of array read checks for decode_plane()
Michael Niedermayer [Fri, 25 Nov 2011 17:04:17 +0000 (18:04 +0100)]
indeo3: out of array read checks for decode_plane()
Fixes: avi+indeo3+++1-dog.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo3: Check remaining bits in parse_bintree()
Michael Niedermayer [Fri, 25 Nov 2011 16:47:17 +0000 (17:47 +0100)]
indeo3: Check remaining bits in parse_bintree()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoH264: Check if more RBSP data in PPS provided by current profile due to Annex A.
Anatoly Nenashev [Fri, 25 Nov 2011 16:10:47 +0000 (17:10 +0100)]
H264: Check if more RBSP data in PPS provided by current profile due to Annex A.
This patch also fix issue https://ffmpeg.org/trac/ffmpeg/ticket/685.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix av_get_channel_layout_string() for positions >31
Mans Rullgard [Fri, 25 Nov 2011 14:58:50 +0000 (14:58 +0000)]
Fix av_get_channel_layout_string() for positions >31

A value shifted left by >31 needs to have a 64-bit type.
As there are no defined channels in this range, the fix
is purely theoretical at this point, although it does
avoid some invalid shifts triggering the overflow
checker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoffmpeg: Warn if output file is empty
Michael Niedermayer [Fri, 25 Nov 2011 15:17:06 +0000 (16:17 +0100)]
ffmpeg: Warn if output file is empty

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: Store vda lib flags in extralibs instead of ldflags
Rafaël Carré [Fri, 25 Nov 2011 00:43:46 +0000 (19:43 -0500)]
configure: Store vda lib flags in extralibs instead of ldflags

This way the needed linking flags end up in libavcodec.pc.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoRELEASE: We're now at 0.8.7.git
Dominique Leuenberger [Fri, 25 Nov 2011 08:45:24 +0000 (09:45 +0100)]
RELEASE: We're now at 0.8.7.git

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMake channel layout masks unsigned
Mans Rullgard [Fri, 25 Nov 2011 12:51:57 +0000 (12:51 +0000)]
Make channel layout masks unsigned

It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.

Fixes a few invalid shifts.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agodca: ARMv6 optimised decode_blockcode()
Mans Rullgard [Sun, 23 Oct 2011 16:39:49 +0000 (17:39 +0100)]
dca: ARMv6 optimised decode_blockcode()

This is a hand-tuned version of the code with impossible parts of
the FASTDIV function ommitted.

2-5% faster overall on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoffprobe: always print int values with print_val()
Stefano Sabatini [Fri, 25 Nov 2011 12:19:01 +0000 (13:19 +0100)]
ffprobe: always print int values with print_val()

In particular, make the json writer write size values, fix regression
introduced with the addition of the print_val() macro.

8 years agonullenc: drop AVFMT_RAWPICTURE from the flags
Luca Barbato [Thu, 24 Nov 2011 22:03:25 +0000 (23:03 +0100)]
nullenc: drop AVFMT_RAWPICTURE from the flags

This makes the two pass encoding with x264 working with -f null - as
first pass.

8 years agoframe-mt: return consumed packet size in ff_thread_decode_frame
Janne Grunau [Thu, 24 Nov 2011 00:50:05 +0000 (01:50 +0100)]
frame-mt: return consumed packet size in ff_thread_decode_frame

This is required to fulfill avcodec_decode_video2() promise to return
the number of consumed bytes on success.

8 years agoaacdec: add more fate tests covering SBR and PS
Janne Grunau [Wed, 23 Nov 2011 00:28:14 +0000 (01:28 +0100)]
aacdec: add more fate tests covering SBR and PS

Add all seven test bitstreams of Coding Technologies "aacPlus Decoder
Check Package". The streams cover different ways to signal SBR and PS
in different formats.

8 years agovf_boxblur: fix memleak
Michael Niedermayer [Fri, 25 Nov 2011 03:44:12 +0000 (04:44 +0100)]
vf_boxblur: fix memleak
As the filter uses the default start frame, the cleanup done by the
default end frame is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 25 Nov 2011 00:38:21 +0000 (01:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  snow: split snow in snowdec and snowenc
  tiffenc: deprecate using compression_level
  swscale: fix failing fate tests.
  swscale: add support for planar RGB input.
  h264: add support for decoding planar RGB images.
  Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].
  pixfmt: add planar RGB formats.

Conflicts:
libavcodec/h264.c
libavcodec/snow.c
libavcodec/utils.c
libavutil/avutil.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c

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