ffmpeg.git
9 years agoescape130: fix colors
Paul B Mahol [Wed, 30 Nov 2011 02:46:35 +0000 (02:46 +0000)]
escape130: fix colors

9 years agoescape130: remove trailing whitespace
Paul B Mahol [Wed, 30 Nov 2011 00:58:16 +0000 (00:58 +0000)]
escape130: remove trailing whitespace

9 years agorpl: enable escape130 codec
Paul B Mahol [Wed, 30 Nov 2011 00:52:14 +0000 (00:52 +0000)]
rpl: enable escape130 codec

9 years agoescape130: minimal effort to make it compile without warnings
Paul B Mahol [Wed, 30 Nov 2011 00:32:23 +0000 (00:32 +0000)]
escape130: minimal effort to make it compile without warnings

9 years agoEscape 130 (RPL) decoder
Eli Friedman [Wed, 30 Nov 2011 00:26:36 +0000 (00:26 +0000)]
Escape 130 (RPL) decoder

9 years agovc1_parser: fix NULL pointer dereference
Michael Niedermayer [Thu, 1 Dec 2011 17:35:58 +0000 (18:35 +0100)]
vc1_parser: fix NULL pointer dereference
Fixes Ticket456

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport ffmpeg -dn to disable copying data streams.
Carl Eugen Hoyos [Thu, 1 Dec 2011 17:02:04 +0000 (18:02 +0100)]
Support ffmpeg -dn to disable copying data streams.

Fixes ticket #647.

9 years agoh264: More restrictive more_rbsp_data_in_pps()
Michael Niedermayer [Thu, 1 Dec 2011 16:28:46 +0000 (17:28 +0100)]
h264: More restrictive more_rbsp_data_in_pps()
Fixes Ticket697

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopictordec: prevent segfault when reading corrupted files
Peter Ross [Thu, 1 Dec 2011 08:17:16 +0000 (19:17 +1100)]
pictordec: prevent segfault when reading corrupted files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopictordec: use correct context for another av_log
Peter Ross [Thu, 1 Dec 2011 08:16:59 +0000 (19:16 +1100)]
pictordec: use correct context for another av_log

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix segfault with ffmpeg -h
Michael Niedermayer [Thu, 1 Dec 2011 03:32:27 +0000 (04:32 +0100)]
ffmpeg: fix segfault with ffmpeg -h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix changing sample rate handling
Michael Niedermayer [Thu, 1 Dec 2011 03:06:59 +0000 (04:06 +0100)]
ffmpeg: fix changing sample rate handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: allow grouping packets in chunks of a user specified size and duration.
Michael Niedermayer [Tue, 29 Nov 2011 23:21:00 +0000 (00:21 +0100)]
lavf: allow grouping packets in chunks of a user specified size and duration.
This is similar to MP4Boxs -inter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: add audio_preload option, this allows interleaving audio earlier
Michael Niedermayer [Wed, 26 Oct 2011 20:17:08 +0000 (22:17 +0200)]
lavf: add audio_preload option, this allows interleaving audio earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: factorize duration calculation in transcode_video()
Michael Niedermayer [Thu, 1 Dec 2011 02:12:39 +0000 (03:12 +0100)]
ffmpeg: factorize duration calculation in transcode_video()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: make copy_tb tri state so the user can select either timebase or
Michael Niedermayer [Thu, 1 Dec 2011 02:06:16 +0000 (03:06 +0100)]
ffmpeg: make copy_tb tri state so the user can select either timebase or
leave it at auto

Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 1 Dec 2011 01:44:19 +0000 (02:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Templatize the code for different g726 bitrate variants
  rv40: move loop filter to rv34dsp context
  lavf: make av_set_pts_info private.
  rtpdec: Add support for G726 audio
  rtpdec: Add an init function that can do custom codec context initialization
  avconv: make copy_tb on by default.
  matroskadec: don't set codec timebase.
  rmdec: don't set codec timebase.
  avconv: compute next_pts from input packet duration when possible.
  lavf: estimate frame duration from r_frame_rate.
  avconv: update InputStream.pts in the streamcopy case.

Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoBPP fix, YUVP9, 10, 16 support, make RGB24 default
Michael Bradshaw [Wed, 30 Nov 2011 23:48:03 +0000 (16:48 -0700)]
BPP fix, YUVP9, 10, 16 support, make RGB24 default

9 years agoUse correct context for av_log.
Carl Eugen Hoyos [Wed, 30 Nov 2011 23:28:46 +0000 (00:28 +0100)]
Use correct context for av_log.

Fixes ticket #695.

9 years agomovenc: replace cluster memset by zeroing only the needed field.
Michael Niedermayer [Wed, 30 Nov 2011 22:11:49 +0000 (23:11 +0100)]
movenc: replace cluster memset by zeroing only the needed field.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortpdec: Templatize the code for different g726 bitrate variants
Martin Storsjö [Wed, 30 Nov 2011 16:05:06 +0000 (18:05 +0200)]
rtpdec: Templatize the code for different g726 bitrate variants

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agorv40: move loop filter to rv34dsp context
Janne Grunau [Wed, 5 Oct 2011 07:29:38 +0000 (09:29 +0200)]
rv40: move loop filter to rv34dsp context

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agolavc: Fix side data handling for audio decoders.
Michael Niedermayer [Wed, 30 Nov 2011 20:19:23 +0000 (21:19 +0100)]
lavc: Fix side data handling for audio decoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agonellymoserdec: Use sidedata to support mid stream sample rate changes.
Michael Niedermayer [Wed, 30 Nov 2011 20:17:57 +0000 (21:17 +0100)]
nellymoserdec: Use sidedata to support mid stream sample rate changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoflvdemux: export flags for nellymoser through side data.
Michael Niedermayer [Wed, 30 Nov 2011 20:16:33 +0000 (21:16 +0100)]
flvdemux: export flags for nellymoser through side data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: make av_set_pts_info private.
Anton Khirnov [Tue, 29 Nov 2011 18:28:15 +0000 (19:28 +0100)]
lavf: make av_set_pts_info private.

It's supposed to be called only from (de)muxers.

9 years agoavfilter: align allocated images to 32 for AVX and IFF
Michael Niedermayer [Wed, 30 Nov 2011 17:46:26 +0000 (18:46 +0100)]
avfilter: align allocated images to 32 for AVX and IFF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: horizontal align for IFF
Michael Niedermayer [Wed, 30 Nov 2011 17:45:33 +0000 (18:45 +0100)]
lavc: horizontal align for IFF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoac3probe: Change threshold from 500 to 200 to keep in sync with mp3.
Michael Niedermayer [Wed, 30 Nov 2011 17:08:23 +0000 (18:08 +0100)]
ac3probe: Change threshold from 500 to 200 to keep in sync with mp3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection
Michael Niedermayer [Wed, 30 Nov 2011 17:07:20 +0000 (18:07 +0100)]
mp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection
on mp3 streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortpdec: Add support for G726 audio
Miroslav Slugeň [Mon, 7 Nov 2011 11:13:55 +0000 (12:13 +0100)]
rtpdec: Add support for G726 audio

This requires using a separate init function, since there
isn't necessarily any fmtp lines for this codec, so
parse_sdp_a_line won't be called. Incorporating it with the
alloc function wouldn't do either, since it is called before
the full rtpmap line is parsed (where the sample rate is
extracted).

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpdec: Add an init function that can do custom codec context initialization
Martin Storsjö [Tue, 29 Nov 2011 14:51:26 +0000 (16:51 +0200)]
rtpdec: Add an init function that can do custom codec context initialization

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agowmall: fix return type of dump_int_buffer()
Michael Niedermayer [Wed, 30 Nov 2011 14:14:44 +0000 (15:14 +0100)]
wmall: fix return type of dump_int_buffer()

Found-by: Dominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomovenc: memset(0) new cluster elements after realloc()
Michael Niedermayer [Wed, 30 Nov 2011 14:01:28 +0000 (15:01 +0100)]
movenc: memset(0) new cluster elements after realloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agowmall: remove tabs that leaked in from a merge and seem to have
Michael Niedermayer [Wed, 30 Nov 2011 14:21:46 +0000 (15:21 +0100)]
wmall: remove tabs that leaked in from a merge and seem to have
managed to silently bypass the push checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: make copy_tb on by default.
Anton Khirnov [Tue, 29 Nov 2011 10:10:31 +0000 (11:10 +0100)]
avconv: make copy_tb on by default.

I.e. on streamcopy set output codec timebase from input stream timebase
(as opposed to input codec timebase). This should be more sane, because
since the stream is not decoded, the input codec tb has no relation to
the timestamps of the copied packets.

9 years agomatroskadec: don't set codec timebase.
Anton Khirnov [Mon, 28 Nov 2011 08:38:32 +0000 (09:38 +0100)]
matroskadec: don't set codec timebase.

It's not supposed to be set outside of lavc.

9 years agormdec: don't set codec timebase.
Anton Khirnov [Mon, 28 Nov 2011 08:17:46 +0000 (09:17 +0100)]
rmdec: don't set codec timebase.

It's not supposed to be set outside of lavc.
Set r_frame_rate instead.

9 years agoavconv: compute next_pts from input packet duration when possible.
Anton Khirnov [Mon, 28 Nov 2011 10:15:06 +0000 (11:15 +0100)]
avconv: compute next_pts from input packet duration when possible.

9 years agolavf: estimate frame duration from r_frame_rate.
Anton Khirnov [Mon, 28 Nov 2011 09:02:21 +0000 (10:02 +0100)]
lavf: estimate frame duration from r_frame_rate.

If r_frame_rate is set, it should be more reliable for this than either
codec or stream timebase.

9 years agoavconv: update InputStream.pts in the streamcopy case.
Anton Khirnov [Mon, 28 Nov 2011 10:47:02 +0000 (11:47 +0100)]
avconv: update InputStream.pts in the streamcopy case.

This was broken in 2a651b719c309c5e2fc663a5a9d6ca36153ab98f.

9 years agoFix typeo in some rarely used memoization
Joseph Wecker [Thu, 10 Nov 2011 22:57:43 +0000 (14:57 -0800)]
Fix typeo in some rarely used memoization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoremoves spurious warning
Joseph Wecker [Thu, 10 Nov 2011 22:57:02 +0000 (14:57 -0800)]
removes spurious warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 30 Nov 2011 01:24:15 +0000 (02:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: check per-plane data buffer against input buffer bounds.
  avconv: Handle audio sync for non-S16 sample formats.
  pthread: don't increment index on zero-sized packets.

Conflicts:
libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg.c use b:v for video bitrates using a target
Jean First [Tue, 29 Nov 2011 16:48:59 +0000 (17:48 +0100)]
ffmpeg.c use b:v for video bitrates using a target

it's more consistent to use -b:v instead of just -b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: do not use a negative total_size (AVERROR) in bitrate estimation.
Clément Bœsch [Tue, 29 Nov 2011 16:59:40 +0000 (17:59 +0100)]
ffmpeg: do not use a negative total_size (AVERROR) in bitrate estimation.

9 years agoConsistently use %ifdef ARCH_X86_64
Reimar Döffinger [Sun, 20 Nov 2011 11:57:57 +0000 (12:57 +0100)]
Consistently use %ifdef ARCH_X86_64

One out of 3 places used ifndef, which is needlessly confusing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoindeo3: check per-plane data buffer against input buffer bounds.
Aneesh Dogra [Tue, 29 Nov 2011 17:43:35 +0000 (23:13 +0530)]
indeo3: check per-plane data buffer against input buffer bounds.

Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102

Signed-off-by: Alex Converse <alex.converse@gmail.com>
9 years agodocs: Spelling fixes to 9 texi files from /doc
root [Tue, 29 Nov 2011 16:54:49 +0000 (17:54 +0100)]
docs: Spelling fixes to 9 texi files from /doc

credits to: Violet Lin (from Google Code-in)

Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofaq.texi: fix spelling errors
root [Tue, 29 Nov 2011 16:50:25 +0000 (17:50 +0100)]
faq.texi: fix spelling errors

credits to: Philip (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodeveloper.texi: fix spelling errors
root [Tue, 29 Nov 2011 16:48:59 +0000 (17:48 +0100)]
developer.texi: fix spelling errors

credits to: KayC (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agogeneral.texi: fix spelling errors
root [Tue, 29 Nov 2011 16:46:29 +0000 (17:46 +0100)]
general.texi: fix spelling errors

credits to: Samuel M (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: dont call set_dimensions() on h264 codec init.
Michael Niedermayer [Tue, 29 Nov 2011 16:23:05 +0000 (17:23 +0100)]
lavc: dont call set_dimensions() on h264 codec init.
This fixes ffprobe showing an incorrect width with
http://panda-test-harness-videos.s3.amazonaws.com/panda.mp4

Idea-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswr: handle correctly muted channel with u8 sample fmt.
Clément Bœsch [Tue, 29 Nov 2011 08:48:38 +0000 (09:48 +0100)]
swr: handle correctly muted channel with u8 sample fmt.

9 years agomovenc: Remove unneeded chunkSize field from MOVIentry
Geek.Song [Tue, 29 Nov 2011 15:50:25 +0000 (16:50 +0100)]
movenc: Remove unneeded chunkSize field from MOVIentry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil: revert project name messing
Michael Niedermayer [Tue, 29 Nov 2011 14:52:28 +0000 (15:52 +0100)]
avutil: revert project name messing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoac3enc: clenaup project name in one comment
Michael Niedermayer [Tue, 29 Nov 2011 14:51:36 +0000 (15:51 +0100)]
ac3enc: clenaup project name in one comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: Handle audio sync for non-S16 sample formats.
Alex Converse [Mon, 28 Nov 2011 23:19:39 +0000 (15:19 -0800)]
avconv: Handle audio sync for non-S16 sample formats.

Also fix reporting of the number of samples added/dropped.

9 years agopthread: don't increment index on zero-sized packets.
Aaron Colwell [Mon, 28 Nov 2011 15:23:03 +0000 (07:23 -0800)]
pthread: don't increment index on zero-sized packets.

The next call to decode() will update from an invalid index, which will
either lead to a memcpy() where dest==src (2 threads), or lead to a
crash (>2 threads).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agomovenc: Write file with minimal number of chunks for the given interleaving.
Michael Niedermayer [Tue, 29 Nov 2011 03:03:22 +0000 (04:03 +0100)]
movenc: Write file with minimal number of chunks for the given interleaving.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 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>
9 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>
9 years agotxd: Fix order of operations.
Alex Converse [Mon, 28 Nov 2011 00:17:13 +0000 (16:17 -0800)]
txd: Fix order of operations.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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.

9 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.

9 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.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 years agomd5proto: Fix order of operations.
Alex Converse [Mon, 28 Nov 2011 00:16:44 +0000 (16:16 -0800)]
md5proto: Fix order of operations.

9 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>
9 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().

9 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.

9 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.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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.

9 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.

9 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>