ffmpeg.git
7 years agompegtsenc: fix some typos: aac -> AAC, adts -> ADTS
Stefano Sabatini [Thu, 12 Jan 2012 18:46:39 +0000 (19:46 +0100)]
mpegtsenc: fix some typos: aac -> AAC, adts -> ADTS

7 years agompegtsenc: use more meaningful error codes
Stefano Sabatini [Thu, 12 Jan 2012 18:45:10 +0000 (19:45 +0100)]
mpegtsenc: use more meaningful error codes

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 13 Jan 2012 00:07:30 +0000 (01:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (21 commits)
  utils: Check for extradata size overflows.
  ARM: rv34: fix asm syntax in dc transform functions
  avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
  rv34: fix and optimise frame dependency checking
  rv34: NEON optimised dc only inverse transform
  avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
  ffmenc: remove references to deprecated AVFormatContext.timestamp.
  lavf: undeprecate read_seek().
  avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
  lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
  lavc: ifdef out parse_only AVOption
  nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
  mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
  riff: remove references to sonic codec ids
  indeo4: add some missing static and const qualifiers
  rv34: DC-only inverse transform
  avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
  lavfi: move version macros to a new installed header version.h
  vsrc_buffer: release the buffer on uninit.
  rgb2rgb: rgb12tobgr12()
  ...

Conflicts:
avconv.c
doc/APIchanges
ffprobe.c
libavfilter/Makefile
libavfilter/avfilter.h
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodocs: remove extra sar entry for scale filter
Lou Logan [Thu, 12 Jan 2012 19:24:26 +0000 (10:24 -0900)]
docs: remove extra sar entry for scale filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix decoding of progressive jpgs with unusual pixel formats.
Carl Eugen Hoyos [Thu, 12 Jan 2012 22:20:33 +0000 (23:20 +0100)]
Fix decoding of progressive jpgs with unusual pixel formats.

Fixes ticket #892.

7 years agoutils: Check for extradata size overflows.
Alex Converse [Thu, 12 Jan 2012 19:12:24 +0000 (11:12 -0800)]
utils: Check for extradata size overflows.

7 years agoARM: rv34: fix asm syntax in dc transform functions
Mans Rullgard [Thu, 12 Jan 2012 19:37:31 +0000 (19:37 +0000)]
ARM: rv34: fix asm syntax in dc transform functions

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoavio: Fix the value of the deprecated URL_FLAG_NONBLOCK
Martin Storsjö [Thu, 12 Jan 2012 15:06:04 +0000 (17:06 +0200)]
avio: Fix the value of the deprecated URL_FLAG_NONBLOCK

This isn't used in practice anywhere within libav at the moment,
but change it for consistency until it is removed.
URL_RDONLY/WRONLY were fixed in commit 5b81e295931 (after the
values that actually were used were changed at the major bump,
in commit cbea3ac8), but this flag was unintentionally left unfixed.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoUse an int MotionVector for find_block_motion.
Reimar Döffinger [Sat, 7 Jan 2012 11:20:38 +0000 (12:20 +0100)]
Use an int MotionVector for find_block_motion.

Using the double variant causes several pointless conversions between
double and int.
Worse, one of the conversions is in an inner loop together with a
function using MMX, resulting in undefined behaviour.
Based on debugging by Ray Simard.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Tested-by: Ray Simard <rhs.ffmpeg@sylvan-glade.com>
7 years agowtvdec: fix a few memleaks as show by valgrind with the FATE test.
Reimar Döffinger [Wed, 11 Jan 2012 23:50:48 +0000 (00:50 +0100)]
wtvdec: fix a few memleaks as show by valgrind with the FATE test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agorv34: fix and optimise frame dependency checking
Janne Grunau [Wed, 11 Jan 2012 19:10:23 +0000 (20:10 +0100)]
rv34: fix and optimise frame dependency checking

The sporadic threading errors during fate-rv30 were caused by calling
ff_thread_await_progress with mb row -1 as argument. That returns
immediately since progress is initialized to -1. Not yet computed
motion vectors from the reference could be used for the first
macroblocks.

7 years agorv34: NEON optimised dc only inverse transform
Janne Grunau [Thu, 12 Jan 2012 16:21:48 +0000 (17:21 +0100)]
rv34: NEON optimised dc only inverse transform

30-50% faster than the C implementation, 0.5% overall speedup on
bourne.rmvb.

7 years agoavprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
Anton Khirnov [Thu, 12 Jan 2012 08:45:13 +0000 (09:45 +0100)]
avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.

7 years agoffmenc: remove references to deprecated AVFormatContext.timestamp.
Anton Khirnov [Thu, 12 Jan 2012 08:38:13 +0000 (09:38 +0100)]
ffmenc: remove references to deprecated AVFormatContext.timestamp.

7 years agolavf: undeprecate read_seek().
Anton Khirnov [Thu, 12 Jan 2012 08:36:11 +0000 (09:36 +0100)]
lavf: undeprecate read_seek().

The "new seeking API" was never finished and nobody is working on it.

7 years agoavserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
Anton Khirnov [Thu, 12 Jan 2012 08:33:16 +0000 (09:33 +0100)]
avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.

7 years agolavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
Anton Khirnov [Thu, 12 Jan 2012 08:29:43 +0000 (09:29 +0100)]
lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I

7 years agolavc: ifdef out parse_only AVOption
Anton Khirnov [Thu, 12 Jan 2012 08:28:15 +0000 (09:28 +0100)]
lavc: ifdef out parse_only AVOption

7 years agonellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
Anton Khirnov [Thu, 12 Jan 2012 08:26:11 +0000 (09:26 +0100)]
nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT

7 years agompegvideo_enc: ifdef out/replace references to deprecated codec flags.
Anton Khirnov [Thu, 12 Jan 2012 08:25:05 +0000 (09:25 +0100)]
mpegvideo_enc: ifdef out/replace references to deprecated codec flags.

7 years agoriff: remove references to sonic codec ids
Anton Khirnov [Thu, 12 Jan 2012 08:12:59 +0000 (09:12 +0100)]
riff: remove references to sonic codec ids

They are deprecated and will be purged on next major bump.

7 years agoffprobe: reindent after previous commit
Stefano Sabatini [Tue, 10 Jan 2012 21:47:07 +0000 (22:47 +0100)]
ffprobe: reindent after previous commit

7 years agoffprobe: add support to audio frame information printing
Stefano Sabatini [Tue, 10 Jan 2012 21:44:32 +0000 (22:44 +0100)]
ffprobe: add support to audio frame information printing

7 years agoffprobe: set AV_LOG_SKIP_REPEATED log flag
Stefano Sabatini [Thu, 12 Jan 2012 16:30:10 +0000 (17:30 +0100)]
ffprobe: set AV_LOG_SKIP_REPEATED log flag

Consistent with ffmpeg and ffplay.

7 years agoFix linesize for rawvideo in mov.
Carl Eugen Hoyos [Thu, 12 Jan 2012 16:02:13 +0000 (17:02 +0100)]
Fix linesize for rawvideo in mov.

Fixes ticket #823.

7 years agoFix compilation with yasm-0.6.2
Carl Eugen Hoyos [Thu, 12 Jan 2012 15:35:49 +0000 (16:35 +0100)]
Fix compilation with yasm-0.6.2

7 years agosws: yuv2rgb asm, add memory clobber.
Michael Niedermayer [Wed, 11 Jan 2012 19:42:23 +0000 (20:42 +0100)]
sws: yuv2rgb asm, add memory clobber.

This fixes dithering for rgb555le, it appears gcc had moved the
setup of the variables after the asm or something like that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoico: reject icon entries that are smaller than sizeof(BITMAPHEADER)
Peter Ross [Thu, 12 Jan 2012 12:42:05 +0000 (23:42 +1100)]
ico: reject icon entries that are smaller than sizeof(BITMAPHEADER)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoico: ignore IconEntry.bpp value, and favour BITMAPHEADER.NumColors value over that...
Peter Ross [Thu, 12 Jan 2012 12:41:50 +0000 (23:41 +1100)]
ico: ignore IconEntry.bpp value, and favour BITMAPHEADER.NumColors value over that in IconEntry

Fixes ticket 905.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoico: consider IconEntry.NumColors of 255 to be ambiguous
Peter Ross [Thu, 12 Jan 2012 12:41:38 +0000 (23:41 +1100)]
ico: consider IconEntry.NumColors of 255 to be ambiguous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: constify enums for .pix_fmts
Paul B Mahol [Wed, 11 Jan 2012 21:30:43 +0000 (21:30 +0000)]
lavc: constify enums for .pix_fmts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmpdec: proper check for alpha
Paul B Mahol [Thu, 12 Jan 2012 01:47:59 +0000 (01:47 +0000)]
bmpdec: proper check for alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: pool draining and self destruction support.
Michael Niedermayer [Thu, 12 Jan 2012 01:32:41 +0000 (02:32 +0100)]
avfilter: pool draining and self destruction support.

This should fix a memleak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: add some missing static and const qualifiers
Kostya Shishkov [Thu, 12 Jan 2012 09:01:33 +0000 (10:01 +0100)]
indeo4: add some missing static and const qualifiers

From the patch by Reimar Döffinger.

7 years agoffprobe: fix leak in show_packets()
Stefano Sabatini [Wed, 11 Jan 2012 23:30:24 +0000 (00:30 +0100)]
ffprobe: fix leak in show_packets()

Call av_free_packets() at each demuxing loop iteration, not only when
decoding.

X-ColaCount: +10l

7 years agoffprobe: replace av_destruct_packet() with av_free_packet()
Stefano Sabatini [Wed, 11 Jan 2012 23:16:21 +0000 (00:16 +0100)]
ffprobe: replace av_destruct_packet() with av_free_packet()

av_destruct_packet() always frees the packet data even when the demuxer
is going to re-use it, thus causing crashes when decoding audio
frames (as implemented in a pending patch).

av_free_packet() is used instead, as it allows each demuxer to set the
right packet data releasing mechanism through the pkt->destruct callback.

7 years agolavfi/testsrc: add "d" alias for the duration option
Stefano Sabatini [Tue, 10 Jan 2012 10:04:59 +0000 (11:04 +0100)]
lavfi/testsrc: add "d" alias for the duration option

7 years agorv34: DC-only inverse transform
Christophe GISQUET [Sun, 1 Jan 2012 17:33:22 +0000 (18:33 +0100)]
rv34: DC-only inverse transform

When decoding coefficients, detect whether the block is DC-only, and take
advantage of this knowledge to perform DC-only inverse transform.

This is achieved by:
- first, changing the 108x4 element modulo_three_table into a 108 element
  table (kind of base4), and accessing each value using mask and shifts.
- then, checking low bits for 0 (as they represent the presence of higher
  frequency coefficients)

Also provide x86 SIMD code for the DC-only inverse transform.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agoavconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
Anton Khirnov [Sat, 31 Dec 2011 16:15:50 +0000 (17:15 +0100)]
avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields

7 years agolavfi: move version macros to a new installed header version.h
Anton Khirnov [Sat, 31 Dec 2011 15:20:10 +0000 (16:20 +0100)]
lavfi: move version macros to a new installed header version.h

7 years agovsrc_buffer: release the buffer on uninit.
Anton Khirnov [Fri, 30 Dec 2011 19:56:06 +0000 (20:56 +0100)]
vsrc_buffer: release the buffer on uninit.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 11 Jan 2012 23:52:40 +0000 (00:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fft: init functions with INIT_XMM/YMM.
  pcmenc: set frame_size to 0.
  gsm demuxer: use generic seeking instead of a gsm-specific function.
  gsm demuxer: return packets with only 1 gsm block at a time.
  avcodec: add GSM parser
  doc: Replace ffmpeg references in avserver config file by avconv.
  doc: Fix names of av_log color environment variables.
  Fix a bunch of platform name and other typos.
  Add some missing changelog entries and release 0.8_beta2
  No longer build libpostproc by default
  wtv: fix memleaks during normal operation
  threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs

Conflicts:
Changelog
RELEASE
cmdutils.c
configure
doc/ffserver.conf
doc/platform.texi
ffplay.c
libavcodec/Makefile
libavcodec/version.h
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorgb2rgb: rgb12tobgr12()
Paul B Mahol [Wed, 11 Jan 2012 19:19:00 +0000 (19:19 +0000)]
rgb2rgb: rgb12tobgr12()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoSupport encoding RGB48 with libopenjpeg.
Carl Eugen Hoyos [Wed, 11 Jan 2012 22:58:43 +0000 (23:58 +0100)]
Support encoding RGB48 with libopenjpeg.

Reviewed-by: Michael Bradshaw
7 years agolatmdec: Check AudioSpecificConfig length before decoding extradata.
Alex Converse [Wed, 11 Jan 2012 22:03:57 +0000 (14:03 -0800)]
latmdec: Check AudioSpecificConfig length before decoding extradata.

This is different than a normal get_bits() over read because
decode_audio_specific_config() creates its own GetBitContext.

Fixes Bug 170.

7 years agocabac: Try to disable problematic ASM for gcc-llvm 4.2.1
Michael Niedermayer [Wed, 11 Jan 2012 17:09:56 +0000 (18:09 +0100)]
cabac: Try to disable problematic ASM for gcc-llvm 4.2.1

This should fix compilation with gcc-llvm (see darwin fate box)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Remove unneeded YUV cliping from yuv2rgb_X_c_template()
Michael Niedermayer [Tue, 10 Jan 2012 19:18:06 +0000 (20:18 +0100)]
sws: Remove unneeded YUV cliping from yuv2rgb_X_c_template()

This should slightly improve speed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmpenc: support for BGRA
Paul B Mahol [Wed, 11 Jan 2012 18:50:05 +0000 (18:50 +0000)]
bmpenc: support for BGRA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: Force full horizontal chroma internally when the output has a odd size.
Michael Niedermayer [Sun, 8 Jan 2012 21:48:58 +0000 (22:48 +0100)]
swscale: Force full horizontal chroma internally when the output has a odd size.

This fixes a gray line on the right side due to 1 column of pixels being skiped.
Fixes Ticket891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: It appears the buffer used is a bit too small.
Michael Niedermayer [Sun, 8 Jan 2012 17:36:17 +0000 (18:36 +0100)]
libmp3lame: It appears the buffer used is a bit too small.

Increase it by an arbitrary amount.
Fixes part of Ticket676

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofft: init functions with INIT_XMM/YMM.
Henrik Gramner [Wed, 11 Jan 2012 17:40:34 +0000 (17:40 +0000)]
fft: init functions with INIT_XMM/YMM.

This is required to handle clobbering of XMM registers on Win64
correctly. Fixes FFT and all tests depending on FFT on Win64.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agotimecode: support >24h timecode.
Clément Bœsch [Wed, 4 Jan 2012 16:30:03 +0000 (17:30 +0100)]
timecode: support >24h timecode.

7 years agotimecode: string representation can be negative.
Clément Bœsch [Wed, 4 Jan 2012 16:06:39 +0000 (17:06 +0100)]
timecode: string representation can be negative.

Timecode can be specified with a negative value in MOV...

7 years agotimecode: set a fixed buffer size of 16B for tc string.
Clément Bœsch [Wed, 11 Jan 2012 16:51:57 +0000 (17:51 +0100)]
timecode: set a fixed buffer size of 16B for tc string.

7 years agopcmenc: set frame_size to 0.
Justin Ruggles [Tue, 10 Jan 2012 20:17:39 +0000 (15:17 -0500)]
pcmenc: set frame_size to 0.

This indicates that the actual frame size is based on the buf_size passed to
avcodec_encode_audio().

7 years agosws: Move yuv2rgb clipping into the tables.
Michael Niedermayer [Tue, 10 Jan 2012 19:56:15 +0000 (20:56 +0100)]
sws: Move yuv2rgb clipping into the tables.

This fixes some cases where the clipping was entirely missing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thanks (for the comments and review) -to: Reimar, beastd, Ronald

7 years agobmpdec: support various bitfields for 32 bit depth
Paul B Mahol [Wed, 11 Jan 2012 02:56:24 +0000 (02:56 +0000)]
bmpdec: support various bitfields for 32 bit depth

Fixes #740

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "v4l2: poll the file descriptor"
Michael Niedermayer [Wed, 11 Jan 2012 13:17:16 +0000 (14:17 +0100)]
Revert "v4l2: poll the file descriptor"

This reverts commit 0efd48dfd15273a5ac85f2fd42f19d419fafe90d.
Reason for the revert is that the code seems based on some
misunderstanding on how the code works.

Conflicts:

libavdevice/v4l2.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogsm demuxer: use generic seeking instead of a gsm-specific function.
Justin Ruggles [Mon, 9 Jan 2012 18:49:52 +0000 (13:49 -0500)]
gsm demuxer: use generic seeking instead of a gsm-specific function.

Since packets all contain only a single block, the generic seek function can
be used while still maintaining block-accuracy.

7 years agogsm demuxer: return packets with only 1 gsm block at a time.
Justin Ruggles [Mon, 9 Jan 2012 18:48:46 +0000 (13:48 -0500)]
gsm demuxer: return packets with only 1 gsm block at a time.

fixes stream copy of raw gsm to mov.
tested with QuickTime.

7 years agoavcodec: add GSM parser
Justin Ruggles [Mon, 9 Jan 2012 00:50:31 +0000 (19:50 -0500)]
avcodec: add GSM parser

The WAVE demuxer returns packets with many blocks per frame, which needs to be
parsed into single blocks. This has a side-effect of fixing the timestamps.

7 years agodoc: Replace ffmpeg references in avserver config file by avconv.
Diego Biurrun [Wed, 11 Jan 2012 09:50:35 +0000 (10:50 +0100)]
doc: Replace ffmpeg references in avserver config file by avconv.

7 years agodoc: Fix names of av_log color environment variables.
Diego Biurrun [Wed, 11 Jan 2012 09:49:49 +0000 (10:49 +0100)]
doc: Fix names of av_log color environment variables.

7 years agoFix a bunch of platform name and other typos.
Diego Biurrun [Mon, 12 Dec 2011 20:21:24 +0000 (21:21 +0100)]
Fix a bunch of platform name and other typos.

7 years agoAdd some missing changelog entries and release 0.8_beta2
Reinhard Tartler [Wed, 11 Jan 2012 08:32:56 +0000 (09:32 +0100)]
Add some missing changelog entries and release 0.8_beta2

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agotiffdec: notify user that tile support is missing
Paul B Mahol [Tue, 10 Jan 2012 18:45:44 +0000 (18:45 +0000)]
tiffdec: notify user that tile support is missing

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoFix step_minus1 pixel descirption for RGB64.
Carl Eugen Hoyos [Wed, 11 Jan 2012 09:54:12 +0000 (10:54 +0100)]
Fix step_minus1 pixel descirption for RGB64.

7 years agoNo longer build libpostproc by default
Reinhard Tartler [Tue, 10 Jan 2012 16:52:50 +0000 (17:52 +0100)]
No longer build libpostproc by default

update documentation to inform developers that it may be removed in a
later release.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoFixes wrong duration in .mov file. Issue 599
Oana Stratulat [Wed, 11 Jan 2012 01:33:25 +0000 (03:33 +0200)]
Fixes wrong duration in .mov file. Issue 599

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: fix unscaled LE<->BE rgb<->bgr
Michael Niedermayer [Wed, 11 Jan 2012 03:07:02 +0000 (04:07 +0100)]
sws: fix unscaled LE<->BE rgb<->bgr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: Fix stray references to libva
Michael Niedermayer [Wed, 11 Jan 2012 02:02:02 +0000 (03:02 +0100)]
doc: Fix stray references to libva
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 11 Jan 2012 01:23:55 +0000 (02:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  rv34: frame-level multi-threading
  mpegvideo: claim ownership of referenced pictures
  aacsbr: prevent out of bounds memcpy().
  ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
  sierravmd: fix audio pts
  bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
  bmpenc: support for PIX_FMT_RGB444
  swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
  swscale: specify register type.
  rv34: use get_bits_left()
  avconv: reinitialize the filtergraph on resolution change.
  vsrc_buffer: error on changing frame parameters.
  avconv: fix -copyinkf.
  fate: Update file checksums after the mov muxer change in a78dbada55d6
  movenc: Don't store a nonzero creation time if nothing was set by the caller
  bmpdec: support for rgb444 with bitfields compression
  rgb2rgb: allow conversion for <15 bpp
  doc: fix stray reference to FFmpeg
  v4l2: use C99 struct initializer
  v4l2: poll the file descriptor
  ...

Conflicts:
avconv.c
libavcodec/aacsbr.c
libavcodec/bethsoftvideo.c
libavcodec/kmvc.c
libavdevice/v4l2.c
libavfilter/vsrc_buffer.c
libswscale/swscale_unscaled.c
libswscale/x86/input.asm
tests/ref/acodec/alac
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov
tests/ref/vsynth1/dnxhd_1080i
tests/ref/vsynth1/mpeg4
tests/ref/vsynth1/qtrle
tests/ref/vsynth1/svq1
tests/ref/vsynth2/dnxhd_1080i
tests/ref/vsynth2/mpeg4
tests/ref/vsynth2/qtrle
tests/ref/vsynth2/svq1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowtv: fix memleaks during normal operation
Janne Grunau [Wed, 11 Jan 2012 00:34:30 +0000 (01:34 +0100)]
wtv: fix memleaks during normal operation

7 years agothreads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs
Janne Grunau [Tue, 10 Jan 2012 16:21:52 +0000 (17:21 +0100)]
threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs

7 years agoMerge remote-tracking branch 'richardpl/sws'
Michael Niedermayer [Tue, 10 Jan 2012 22:12:21 +0000 (23:12 +0100)]
Merge remote-tracking branch 'richardpl/sws'

* richardpl/sws:
  rgb2rgb: remove unused bgr8torgb8()
  rgb2rgb: rgb12tobgr12()
  rgb2rgb: allow conversion for <15 bpp
  bmpenc: support for PIX_FMT_RGB444
  bmpdec: support for rgb444 with bitfields compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86inc: remove duplicate movlhps
Michael Niedermayer [Tue, 10 Jan 2012 21:59:34 +0000 (22:59 +0100)]
x86inc: remove duplicate movlhps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoljpegdec: Fix the left column of rgb24 decoding
Michael Niedermayer [Mon, 9 Jan 2012 19:12:33 +0000 (20:12 +0100)]
ljpegdec: Fix the left column of rgb24 decoding

Fixes Ticket894

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv34: frame-level multi-threading
Janne Grunau [Fri, 9 Sep 2011 12:26:32 +0000 (14:26 +0200)]
rv34: frame-level multi-threading

Statistics for bourne.rmvb -an -f null

1 thread:  37.12s user 0.03s system  99% cpu 37.174 total
2 threads: 47.63s user 0.24s system 185% cpu 25.807 total
4 threads: 41.21s user 0.30s system 327% cpu 12.674 total

7 years agompegvideo: claim ownership of referenced pictures
Janne Grunau [Tue, 10 Jan 2012 14:08:20 +0000 (15:08 +0100)]
mpegvideo: claim ownership of referenced pictures

Under certain conditions pictures could be released before they were
returned with frame-threading. Broken mv computation in the upcoming
rv34 frame-threading patch was caused by this.

To prevent contexts from running out of available pictures the loop
releasing "unused" pictures has to be run for B frames too.

7 years agoffprobe: use av_toupper() in upcase_string()
Stefano Sabatini [Tue, 10 Jan 2012 21:11:02 +0000 (22:11 +0100)]
ffprobe: use av_toupper() in upcase_string()

7 years agoaacsbr: prevent out of bounds memcpy().
Alex Converse [Tue, 10 Jan 2012 21:07:09 +0000 (13:07 -0800)]
aacsbr: prevent out of bounds memcpy().

Fixes Libav Bug 195.

This doesn't make the code handle sample rate or upsample/downsample
change properly but this is still a good sanity check.

Based on change by Michael Niedermayer.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agoMerge remote-tracking branch 'hexene/stagefright'
Michael Niedermayer [Tue, 10 Jan 2012 19:59:36 +0000 (20:59 +0100)]
Merge remote-tracking branch 'hexene/stagefright'

* hexene/stagefright:
  libstagefright: fix build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
Justin Ruggles [Tue, 10 Jan 2012 13:48:23 +0000 (08:48 -0500)]
ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM

frame sample count calculation was incorrect

7 years agosierravmd: fix audio pts
Justin Ruggles [Tue, 10 Jan 2012 14:24:21 +0000 (09:24 -0500)]
sierravmd: fix audio pts

The duration of the first packet was being calculated incorrectly, leading to
an incorrect timestamp offset.

7 years agoRevert "swscale: fix integer overflows in RGB pixel writing."
Michael Niedermayer [Tue, 10 Jan 2012 16:24:14 +0000 (17:24 +0100)]
Revert "swscale: fix integer overflows in RGB pixel writing."

This reverts commit 77d88b872d8cbb42738ede2d4fc098c16f204236.

The revert fixes actual overflows and a segfault as the variables
are signed and can be negative.

Conflicts:

libswscale/swscale.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
Aneesh Dogra [Tue, 10 Jan 2012 18:08:03 +0000 (23:38 +0530)]
bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorgb2rgb: remove unused bgr8torgb8()
Paul B Mahol [Tue, 10 Jan 2012 18:15:16 +0000 (18:15 +0000)]
rgb2rgb: remove unused bgr8torgb8()

RGB8 and BGR8 are paletted formats now.

7 years agoRELEASE: We're now at 0.9.1.git
Dominique Leuenberger [Tue, 10 Jan 2012 18:19:53 +0000 (19:19 +0100)]
RELEASE: We're now at 0.9.1.git

7 years agorgb2rgb: rgb12tobgr12()
Paul B Mahol [Tue, 10 Jan 2012 17:29:16 +0000 (17:29 +0000)]
rgb2rgb: rgb12tobgr12()

7 years agorgb2rgb: allow conversion for <15 bpp
Paul B Mahol [Tue, 10 Jan 2012 02:17:33 +0000 (02:17 +0000)]
rgb2rgb: allow conversion for <15 bpp

7 years agobmpenc: support for PIX_FMT_RGB444
Paul B Mahol [Tue, 10 Jan 2012 00:42:20 +0000 (00:42 +0000)]
bmpenc: support for PIX_FMT_RGB444

7 years agobmpdec: support for rgb444 with bitfields compression
Paul B Mahol [Mon, 9 Jan 2012 23:12:40 +0000 (23:12 +0000)]
bmpdec: support for rgb444 with bitfields compression

Do not display garbage for invalid/unsupported bitfields values.

7 years agobmpenc: support for PIX_FMT_RGB444
Paul B Mahol [Tue, 10 Jan 2012 16:06:02 +0000 (16:06 +0000)]
bmpenc: support for PIX_FMT_RGB444

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoffprobe: add compact option to JSON writer
Stefano Sabatini [Mon, 9 Jan 2012 13:36:52 +0000 (14:36 +0100)]
ffprobe: add compact option to JSON writer

7 years agoffprobe: add -show_program_version and -show_library_versions options
Stefano Sabatini [Sun, 1 Jan 2012 16:19:58 +0000 (17:19 +0100)]
ffprobe: add -show_program_version and -show_library_versions options

7 years agoswscale: fix crash in fast_bilinear code when compiled with -mred-zone.
Ronald S. Bultje [Sun, 20 Nov 2011 23:54:15 +0000 (15:54 -0800)]
swscale: fix crash in fast_bilinear code when compiled with -mred-zone.

Additional comments from Måns Rullgard have been integrated
by Reinhard Tartler.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoffprobe: make upcase_string() ignore non-ASCII characters
Stefano Sabatini [Sun, 8 Jan 2012 10:10:06 +0000 (11:10 +0100)]
ffprobe: make upcase_string() ignore non-ASCII characters

This is required as some section names may contain non-ASCII characters
(e.g. '_').

7 years agoswscale: specify register type.
Oka Motofumi [Tue, 10 Jan 2012 14:39:04 +0000 (06:39 -0800)]
swscale: specify register type.

Fixes a compilation failure on win64.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agolibstagefright: fix build
Dmitry Monakhov [Sat, 7 Jan 2012 15:05:51 +0000 (15:05 +0000)]
libstagefright: fix build

- Use headers from gingerbread-release branch instead of the current default ice cream sandwich
- Fix path mistype

7 years agorv34: use get_bits_left()
Janne Grunau [Mon, 9 Jan 2012 01:06:59 +0000 (02:06 +0100)]
rv34: use get_bits_left()

It is not necessary to store the bit stream length in a RV34DecContext
field.