ffmpeg.git
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 28 Nov 2011 23:20:29 +0000 (00:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adtsenc: Check frame size.
  txd: Fix order of operations.
  APIchanges: fill in some blanks
  timer: fix misspelling of "decicycles"
  Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
  indeo3: cosmetics
  md5proto: Fix order of operations.
  dca: Replace oversized unused get_bits() with skip_bits_long().

Conflicts:
doc/APIchanges
libavformat/mmsh.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoadtsenc: Check frame size.
Alex Converse [Mon, 28 Nov 2011 08:48:53 +0000 (00:48 -0800)]
adtsenc: Check frame size.

Inspired by work from: Michael Niedermayer <michaelni@gmx.at>.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agotxd: Fix order of operations.
Alex Converse [Mon, 28 Nov 2011 00:17:13 +0000 (16:17 -0800)]
txd: Fix order of operations.

8 years agoAPIchanges: fill in some blanks
Mans Rullgard [Mon, 28 Nov 2011 16:47:03 +0000 (16:47 +0000)]
APIchanges: fill in some blanks

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoffv1dec: use PIX_FMT_0RGB32 when there is no transparency plane
Michael Niedermayer [Mon, 28 Nov 2011 16:41:27 +0000 (17:41 +0100)]
ffv1dec: use PIX_FMT_0RGB32 when there is no transparency plane

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1dec: transparency plane support.
Michael Niedermayer [Mon, 28 Nov 2011 16:40:39 +0000 (17:40 +0100)]
ffv1dec: transparency plane support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1enc: PIX_FMT_0RGB32 support
Michael Niedermayer [Mon, 28 Nov 2011 16:39:25 +0000 (17:39 +0100)]
ffv1enc: PIX_FMT_0RGB32 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1enc: Store transparency plane.
Michael Niedermayer [Mon, 28 Nov 2011 16:38:04 +0000 (17:38 +0100)]
ffv1enc: Store transparency plane.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotimer: fix misspelling of "decicycles"
Mans Rullgard [Mon, 28 Nov 2011 14:21:48 +0000 (14:21 +0000)]
timer: fix misspelling of "decicycles"

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agohuffyuvenc: switch from alphaless rgb32 to rgb24
Michael Niedermayer [Mon, 28 Nov 2011 14:07:48 +0000 (15:07 +0100)]
huffyuvenc: switch from alphaless rgb32 to rgb24

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: print codec timecode if available.
Clément Bœsch [Wed, 16 Nov 2011 16:42:48 +0000 (17:42 +0100)]
ffprobe: print codec timecode if available.

8 years agompeg12: raise timecode to codec context.
Clément Bœsch [Wed, 16 Nov 2011 16:40:00 +0000 (17:40 +0100)]
mpeg12: raise timecode to codec context.

8 years agoEliminate pointless 0/NULL initializers in AVCodec and similar declarations.
Diego Biurrun [Sat, 26 Nov 2011 17:35:26 +0000 (18:35 +0100)]
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.

8 years agoindeo3: cosmetics
Kostya Shishkov [Mon, 28 Nov 2011 08:33:36 +0000 (09:33 +0100)]
indeo3: cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agosdp: Fix null pointer dereference with aac and ffserver.
Carl [Mon, 28 Nov 2011 03:22:11 +0000 (04:22 +0100)]
sdp: Fix null pointer dereference with aac and ffserver.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agohuffyuvenc: support alphaless rgb32
Michael Niedermayer [Mon, 28 Nov 2011 02:44:47 +0000 (03:44 +0100)]
huffyuvenc: support alphaless rgb32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agohuffyuvenc: store alpha for bgr32
Michael Niedermayer [Mon, 28 Nov 2011 02:44:20 +0000 (03:44 +0100)]
huffyuvenc: store alpha for bgr32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agomd5proto: Fix order of operations.
Alex Converse [Mon, 28 Nov 2011 00:16:44 +0000 (16:16 -0800)]
md5proto: Fix order of operations.

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 agodca: Replace oversized unused get_bits() with skip_bits_long().
Alex Converse [Sun, 27 Nov 2011 23:48:20 +0000 (15:48 -0800)]
dca: Replace oversized unused get_bits() with skip_bits_long().

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>