ffmpeg.git
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Oct 2011 23:49:32 +0000 (01:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays
  VC1: restore mistakenly removed code
  twinvq: check output buffer size before decoding
  twinvq: return an error when the packet size is too small
  lavf: export some forgotten symbols with non-av prefixes.
  swscale: update altivec yuv2planeX asm to new per-plane API.
  swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.
  yuv2planeX10 SIMD
  swscale: decide whether to use yuv2plane1/X on a per-plane basis.
  swscale: reintroduce full precision in 16-bit output.
  Split up yuv2yuvX functions
  Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions
  lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
  lavc: translate non-flag-based er options into flag-based ef options at codec open
  add -err_filter AVOptions to access flag-based error recognition
  h264_weight: initialize "height" function argument properly.
  presets: spelling error in libvpx 1080p50_60
  avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X

Conflicts:
ffplay.c
libavformat/libavformat.v
libswscale/swscale.c
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "mov: do not misreport empty stts"
Carl Eugen Hoyos [Sat, 22 Oct 2011 22:54:56 +0000 (00:54 +0200)]
Revert "mov: do not misreport empty stts"

Fixes ticket #578.

This reverts commit 30c3d976f12665d5d13971172aab062a97cb1bce.

8 years agoid3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays
Michael Karcher [Sat, 22 Oct 2011 13:41:30 +0000 (15:41 +0200)]
id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoVC1: restore mistakenly removed code
Mashiat Sarker Shakkhar [Sat, 22 Oct 2011 14:41:04 +0000 (19:41 +0500)]
VC1: restore mistakenly removed code

The code was mistakenly removed in cad16562c8d76ea2a2a6495f29296c3ff7966946.
It stored some motion vector data for future use in B-pictures.

This fixes Bugzilla bug #57.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoMerge remote-tracking branch 'mans/dnxhd'
Michael Niedermayer [Sat, 22 Oct 2011 20:18:09 +0000 (22:18 +0200)]
Merge remote-tracking branch 'mans/dnxhd'

* mans/dnxhd:
  dnxhddec: cache luma/chroma_weight*qscale tables for last qscale
  dnxhddec: merge ac_{index,run}_flags
  dnxhddec: store 2*level+1 in ac_level tables
  dnxhddec: rearrange decode_dct_block loop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotwinvq: check output buffer size before decoding
Justin Ruggles [Fri, 23 Sep 2011 23:50:41 +0000 (19:50 -0400)]
twinvq: check output buffer size before decoding

8 years agotwinvq: return an error when the packet size is too small
Justin Ruggles [Fri, 23 Sep 2011 23:25:47 +0000 (19:25 -0400)]
twinvq: return an error when the packet size is too small

8 years agolavf: export some forgotten symbols with non-av prefixes.
Anton Khirnov [Sat, 22 Oct 2011 19:08:31 +0000 (21:08 +0200)]
lavf: export some forgotten symbols with non-av prefixes.

8 years agoAdd rule for compiling to asm
Mans Rullgard [Fri, 4 Mar 2011 19:41:33 +0000 (19:41 +0000)]
Add rule for compiling to asm

This allows commands of the form "make foo.s", which is useful
for inspecting the compiler output for debugging purposes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbisenc: simplify floor_classes[] table
Mans Rullgard [Sat, 16 Jul 2011 14:31:41 +0000 (15:31 +0100)]
vorbisenc: simplify floor_classes[] table

This avoids an indirection in the table.  Data size is slightly
smaller on 64-bit systems, 8 bytes larger on 32-bit.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 214a85202b2eedbef06357e40278c2f56aa2c6e3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodca: ARMv6 optimised decode_blockcode()
Mans Rullgard [Thu, 29 Sep 2011 21:03:40 +0000 (22:03 +0100)]
dca: ARMv6 optimised decode_blockcode()

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 08e3dea3f7f69309574dafc0af6671615e909720)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCheck for cbrtf() and provide fallback
Mans Rullgard [Tue, 6 Jul 2010 23:27:52 +0000 (00:27 +0100)]
Check for cbrtf() and provide fallback
(cherry picked from commit bfb37d7db1c6394099f6b177e10d6e769e678f6a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoratecontrol: replace VLAs with malloc/free
Mans Rullgard [Sun, 4 Jul 2010 00:58:13 +0000 (01:58 +0100)]
ratecontrol: replace VLAs with malloc/free
(cherry picked from commit 2c6bd7d1f992989d1cc108534e0896771b86824f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoer: replace VLA with malloc/free
Mans Rullgard [Sun, 4 Jul 2010 00:57:47 +0000 (01:57 +0100)]
er: replace VLA with malloc/free
(cherry picked from commit 5c2d016a85453f121285d125ed049a8cf492855a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: update altivec yuv2planeX asm to new per-plane API.
Ronald S. Bultje [Sat, 15 Oct 2011 23:00:42 +0000 (16:00 -0700)]
swscale: update altivec yuv2planeX asm to new per-plane API.

8 years agoswscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.
Ronald S. Bultje [Sat, 15 Oct 2011 21:19:33 +0000 (14:19 -0700)]
swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.

Also implement MMX/MMX2 versions and SSE4 versions.

8 years agoyuv2planeX10 SIMD
Kieran Kunhya [Sun, 9 Oct 2011 15:20:48 +0000 (16:20 +0100)]
yuv2planeX10 SIMD

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoswscale: decide whether to use yuv2plane1/X on a per-plane basis.
Ronald S. Bultje [Wed, 5 Oct 2011 14:37:24 +0000 (07:37 -0700)]
swscale: decide whether to use yuv2plane1/X on a per-plane basis.

8 years agoswscale: reintroduce full precision in 16-bit output.
Ronald S. Bultje [Wed, 5 Oct 2011 13:27:52 +0000 (06:27 -0700)]
swscale: reintroduce full precision in 16-bit output.

8 years agoSplit up yuv2yuvX functions
Kieran Kunhya [Tue, 4 Oct 2011 11:22:03 +0000 (12:22 +0100)]
Split up yuv2yuvX functions

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoSplit out yuv2yuv1 luma and chroma in order to make them generic DSP functions
Kieran Kunhya [Fri, 30 Sep 2011 12:50:49 +0000 (13:50 +0100)]
Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoavcodec: add ifdef from qatar that could not be merged previously due to compilation...
Michael Niedermayer [Sat, 22 Oct 2011 14:51:40 +0000 (16:51 +0200)]
avcodec: add ifdef from qatar that could not be merged previously due to compilation failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocodec_names: invoke preprocessor on avcodec.h.
Nicolas George [Sat, 22 Oct 2011 08:55:44 +0000 (10:55 +0200)]
codec_names: invoke preprocessor on avcodec.h.

This fixes failures when codec IDs are defined conditionally,
for example when scheduling for a major bump.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 22 Oct 2011 14:38:03 +0000 (16:38 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: reallocate SDL overlays for OSX when changing full screen

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: replace references to deprecated AVCodecContext.error_recognition to use AVCode...
Dustin Brody [Sat, 22 Oct 2011 12:44:16 +0000 (08:44 -0400)]
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc: translate non-flag-based er options into flag-based ef options at codec open
Dustin Brody [Sat, 22 Oct 2011 12:44:15 +0000 (08:44 -0400)]
lavc: translate non-flag-based er options into flag-based ef options at codec open

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoadd -err_filter AVOptions to access flag-based error recognition
Dustin Brody [Sat, 22 Oct 2011 12:44:14 +0000 (08:44 -0400)]
add -err_filter AVOptions to access flag-based error recognition

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoMerge remote-tracking branch 'mans/ac3'
Michael Niedermayer [Sat, 22 Oct 2011 09:11:08 +0000 (11:11 +0200)]
Merge remote-tracking branch 'mans/ac3'

* mans/ac3:
  ac3enc: slightly faster quantize_mantissas_blk_ch()
  ac3enc: NEON optimised sum_square_butterfly_float
  ac3enc: neon optimised sum_square_butterfly_int32
  ac3enc: move inner loop of compute_rematrixing_strategy to ac3dsp

Conflicts:
libavcodec/ac3enc_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264_weight: initialize "height" function argument properly.
Ronald S. Bultje [Sat, 22 Oct 2011 01:00:39 +0000 (18:00 -0700)]
h264_weight: initialize "height" function argument properly.

Right now it's not actually initialized on 32-bit, leading to crashes
on win32.

8 years agosws: fix warning: new qualifiers in middle of multi-level non-const cast are unsafe...
Michael Niedermayer [Sat, 22 Oct 2011 03:14:08 +0000 (05:14 +0200)]
sws: fix warning: new qualifiers in middle of multi-level non-const cast are unsafe warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix comment: Enhanced AC-3 in mov is defined in ETSI TS 102 366.
Carl Eugen Hoyos [Sat, 22 Oct 2011 00:23:56 +0000 (02:23 +0200)]
Fix comment: Enhanced AC-3 in mov is defined in ETSI TS 102 366.

8 years agopulse: fix application name
Michael Niedermayer [Sat, 22 Oct 2011 00:11:50 +0000 (02:11 +0200)]
pulse: fix application name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'luzero/pulse'
Michael Niedermayer [Fri, 21 Oct 2011 23:56:57 +0000 (01:56 +0200)]
Merge remote-tracking branch 'luzero/pulse'

* luzero/pulse:
  pulse: cosmetics
  pulse: introduce pulseaudio input

Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: move code out of main of check_exec_crash()
Michael Niedermayer [Fri, 21 Oct 2011 22:10:29 +0000 (00:10 +0200)]
configure: move code out of main of check_exec_crash()

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove redundant libx264 preset files
Lou Logan [Fri, 21 Oct 2011 21:08:33 +0000 (13:08 -0800)]
Remove redundant libx264 preset files

These are available via -preset or -vprofile and the addition of
-qp 0 or -crf 0 if lossless is desired.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 21 Oct 2011 23:03:27 +0000 (01:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (35 commits)
  flvdec: Do not call parse_keyframes_index with a NULL stream
  libspeexdec: include system headers before local headers
  libspeexdec: return meaningful error codes
  libspeexdec: cosmetics: reindent
  libspeexdec: decode one frame at a time.
  swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()
  Move timefilter code from lavf to lavd.
  mov: add support for hdvd and pgapmetadata atoms
  mov: rename function _stik, some indentation cosmetics
  mov: rename function _int8 to remove ambiguity, some indentation cosmetics
  mov: parse the gnre atom
  mp3on4: check for allocation failures in decode_init_mp3on4()
  mp3on4: create a separate flush function for MP3onMP4.
  mp3on4: ensure that the frame channel count does not exceed the codec channel count.
  mp3on4: set channel layout
  mp3on4: fix the output channel order
  mp3on4: allocate temp buffer with av_malloc() instead of on the stack.
  mp3on4: copy MPADSPContext from first context to all contexts.
  fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm
  fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm
  ...

Conflicts:
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_ps.c
libavcodec/h264dsp_template.c
libavcodec/h264idct_template.c
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavcodec/x86/h264dsp_mmx.c
libavdevice/Makefile
libavdevice/jack_audio.c
libavformat/Makefile
libavformat/flvdec.c
libavformat/flvenc.c
libavutil/pixfmt.h
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopresets: spelling error in libvpx 1080p50_60
Lou Logan [Thu, 20 Oct 2011 21:21:31 +0000 (21:21 +0000)]
presets: spelling error in libvpx 1080p50_60

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoavplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X
Marton Balint [Fri, 21 Oct 2011 12:56:57 +0000 (14:56 +0200)]
avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X

The blue channel went missing when toggling fullscreen on Mac OS X.

8 years agoflvdec: Do not call parse_keyframes_index with a NULL stream
Reimar Döffinger [Wed, 19 Oct 2011 16:41:02 +0000 (18:41 +0200)]
flvdec: Do not call parse_keyframes_index with a NULL stream

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibspeexdec: include system headers before local headers
Justin Ruggles [Fri, 21 Oct 2011 16:13:28 +0000 (12:13 -0400)]
libspeexdec: include system headers before local headers

8 years agolibspeexdec: return meaningful error codes
Justin Ruggles [Fri, 21 Oct 2011 16:13:04 +0000 (12:13 -0400)]
libspeexdec: return meaningful error codes

8 years agolibspeexdec: cosmetics: reindent
Justin Ruggles [Fri, 21 Oct 2011 16:10:35 +0000 (12:10 -0400)]
libspeexdec: cosmetics: reindent

8 years agolibspeexdec: decode one frame at a time.
Justin Ruggles [Fri, 21 Oct 2011 16:07:42 +0000 (12:07 -0400)]
libspeexdec: decode one frame at a time.

This allows for knowing the output size before decoding even when there is no
header (e.g. FLV). Otherwise we would have to do a preliminary full frame
decode to determine the number of frames-per-packet.

8 years agomov: support eac3 audio
Hendrik Leppkes [Tue, 3 May 2011 15:22:13 +0000 (17:22 +0200)]
mov: support eac3 audio

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegts: remove read_seek()
Michael Niedermayer [Fri, 21 Oct 2011 19:48:15 +0000 (21:48 +0200)]
mpegts: remove read_seek()
Its redundant

Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoutils: disable debuging code at the end of av_gen_search()
Michael Niedermayer [Fri, 21 Oct 2011 20:08:39 +0000 (22:08 +0200)]
utils: disable debuging code at the end of av_gen_search()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoutils: flush on successfull av_seek_frame_binary()
Michael Niedermayer [Fri, 21 Oct 2011 20:26:13 +0000 (22:26 +0200)]
utils: flush on successfull av_seek_frame_binary()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()
Mans Rullgard [Fri, 21 Oct 2011 19:36:11 +0000 (20:36 +0100)]
swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegts: cache information to speed up seeking.
Michael Niedermayer [Fri, 21 Oct 2011 19:11:28 +0000 (21:11 +0200)]
mpegts: cache information to speed up seeking.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoseek: Fix av_gen_search() so that seeks outside max/min do not successfully seek...
Michael Niedermayer [Fri, 21 Oct 2011 18:45:00 +0000 (20:45 +0200)]
seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random
points but rather seek to the min/max.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMove timefilter code from lavf to lavd.
Anton Khirnov [Fri, 21 Oct 2011 09:47:39 +0000 (11:47 +0200)]
Move timefilter code from lavf to lavd.

It's only used in the JACK device.

Fixes linking shared lavd with JACK enabled.

8 years agomov: add support for hdvd and pgapmetadata atoms
Raivo Hool [Fri, 21 Oct 2011 13:04:15 +0000 (16:04 +0300)]
mov: add support for hdvd and pgapmetadata atoms

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomov: rename function _stik, some indentation cosmetics
Raivo Hool [Fri, 21 Oct 2011 13:04:14 +0000 (16:04 +0300)]
mov: rename function _stik, some indentation cosmetics

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomov: rename function _int8 to remove ambiguity, some indentation cosmetics
Raivo Hool [Fri, 21 Oct 2011 13:04:13 +0000 (16:04 +0300)]
mov: rename function _int8 to remove ambiguity, some indentation cosmetics

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomov: parse the gnre atom
Raivo Hool [Fri, 21 Oct 2011 13:51:33 +0000 (16:51 +0300)]
mov: parse the gnre atom

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomp3on4: check for allocation failures in decode_init_mp3on4()
Justin Ruggles [Sun, 25 Sep 2011 18:32:42 +0000 (14:32 -0400)]
mp3on4: check for allocation failures in decode_init_mp3on4()

8 years agomp3on4: create a separate flush function for MP3onMP4.
Justin Ruggles [Sun, 25 Sep 2011 17:39:04 +0000 (13:39 -0400)]
mp3on4: create a separate flush function for MP3onMP4.

The correct decoder private context needs to be used.
This fixes mp3on4 playback and seeking in avplay.

8 years agomp3on4: ensure that the frame channel count does not exceed the codec channel
Justin Ruggles [Sun, 25 Sep 2011 17:04:39 +0000 (13:04 -0400)]
mp3on4: ensure that the frame channel count does not exceed the codec channel
count.

This also allows for checking output data size based on the actual
number of channel instead of the maximum number of channels.

8 years agomp3on4: set channel layout
Justin Ruggles [Sun, 25 Sep 2011 16:52:11 +0000 (12:52 -0400)]
mp3on4: set channel layout

8 years agomp3on4: fix the output channel order
Justin Ruggles [Sun, 25 Sep 2011 16:46:54 +0000 (12:46 -0400)]
mp3on4: fix the output channel order

8 years agomp3on4: allocate temp buffer with av_malloc() instead of on the stack.
Justin Ruggles [Sun, 25 Sep 2011 16:30:16 +0000 (12:30 -0400)]
mp3on4: allocate temp buffer with av_malloc() instead of on the stack.

Avoids allocating unnecessary memory and ensures proper alignment.

8 years agomp3on4: copy MPADSPContext from first context to all contexts.
Justin Ruggles [Sun, 25 Sep 2011 16:16:34 +0000 (12:16 -0400)]
mp3on4: copy MPADSPContext from first context to all contexts.

Fixes segfault when decoding multi-channel MP3onMP4 files.

8 years agompegts: assert position in dts reading code.
Michael Niedermayer [Fri, 21 Oct 2011 15:37:08 +0000 (17:37 +0200)]
mpegts: assert position in dts reading code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegts: add and use mpegts_get_dts()
Michael Niedermayer [Fri, 21 Oct 2011 14:11:00 +0000 (16:11 +0200)]
mpegts: add and use mpegts_get_dts()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegts: fix type of argument of mpegts_resync()
Michael Niedermayer [Fri, 21 Oct 2011 14:10:16 +0000 (16:10 +0200)]
mpegts: fix type of argument of mpegts_resync()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm
Justin Ruggles [Mon, 10 Oct 2011 04:43:08 +0000 (00:43 -0400)]
fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm

8 years agofmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm
Justin Ruggles [Mon, 10 Oct 2011 03:52:03 +0000 (23:52 -0400)]
fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm

8 years agofmtconvert: check compile-time x86 instruction set flags
Justin Ruggles [Mon, 10 Oct 2011 00:01:22 +0000 (20:01 -0400)]
fmtconvert: check compile-time x86 instruction set flags

8 years agofmtconvert: port float_to_int16() x86 inline asm to yasm
Justin Ruggles [Sun, 9 Oct 2011 23:12:09 +0000 (19:12 -0400)]
fmtconvert: port float_to_int16() x86 inline asm to yasm

8 years agofmtconvert: fix and extend documentation for float_interleave()
Justin Ruggles [Sun, 9 Oct 2011 20:30:11 +0000 (16:30 -0400)]
fmtconvert: fix and extend documentation for float_interleave()

8 years agoflvenc: store delay and last_ts per-stream.
Justin Ruggles [Thu, 20 Oct 2011 19:08:48 +0000 (15:08 -0400)]
flvenc: store delay and last_ts per-stream.

8 years agoh264: fix ppc/altivec build
Mans Rullgard [Fri, 21 Oct 2011 11:34:08 +0000 (12:34 +0100)]
h264: fix ppc/altivec build

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoEnable multithreding when decoding with libopenjpeg
Jean First [Fri, 30 Sep 2011 07:42:45 +0000 (09:42 +0200)]
Enable multithreding when decoding with libopenjpeg

Enable multithreding when decoding with libopenjpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: mark some MC functions with av_always_inline instead of inline.
Ronald S. Bultje [Fri, 21 Oct 2011 06:36:23 +0000 (23:36 -0700)]
h264: mark some MC functions with av_always_inline instead of inline.

This actually causes them to be inlined, leading to a significant
speedup (1-1.5% in my measurements).

8 years agoH264: have hl_motion() and its callees take a chroma_idc argument.
Ronald S. Bultje [Fri, 21 Oct 2011 07:01:16 +0000 (00:01 -0700)]
H264: have hl_motion() and its callees take a chroma_idc argument.

8 years agodeshake: add documentation in filters.texi
Paul Flinders [Thu, 20 Oct 2011 14:10:16 +0000 (16:10 +0200)]
deshake: add documentation in filters.texi

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
8 years agoH264: change weight/biweight functions to take a height argument.
Ronald S. Bultje [Fri, 21 Oct 2011 07:00:39 +0000 (00:00 -0700)]
H264: change weight/biweight functions to take a height argument.

Neon parts by Mans Rullgard <mans@mansr.com>.

8 years agoSupport for lossless and inter H264 4:2:2.
Ronald S. Bultje [Wed, 12 Oct 2011 15:55:37 +0000 (08:55 -0700)]
Support for lossless and inter H264 4:2:2.

8 years agoh264: 4:2:2 intra decoding support
Baptiste Coudurier [Tue, 16 Aug 2011 15:05:44 +0000 (17:05 +0200)]
h264: 4:2:2 intra decoding support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agosws/pixfmt/pixdesc: add support for yuv420p9le/be.
Ronald S. Bultje [Fri, 21 Oct 2011 07:38:04 +0000 (00:38 -0700)]
sws/pixfmt/pixdesc: add support for yuv420p9le/be.

8 years agoRevert d1d421cbc0d13b08535f7fc08d179572ee352072: change to fate-lavfi-crop_scale.
Ronald S. Bultje [Fri, 21 Oct 2011 07:21:31 +0000 (00:21 -0700)]
Revert d1d421cbc0d13b08535f7fc08d179572ee352072: change to fate-lavfi-crop_scale.

8 years agovp8: fix up handling of segmentation_maps in reference frames.
Ronald S. Bultje [Tue, 18 Oct 2011 00:10:16 +0000 (17:10 -0700)]
vp8: fix up handling of segmentation_maps in reference frames.

Associate segmentation_map[] with reference frame, rather than
decoding instance. This fixes cases where the map would be free()'ed
on e.g. a size change in one thread, whereas the other thread was
still accessing it. Also, it fixes cases where threads overwrite data
that is still being referenced by the previous thread, who thinks that
it's part of the frame previously decoded by the next thread.

8 years agoswscale: prevent overflow in coefficient calculation.
Ronald S. Bultje [Thu, 20 Oct 2011 02:56:56 +0000 (19:56 -0700)]
swscale: prevent overflow in coefficient calculation.

8 years agofix shared lib build
Michael Niedermayer [Fri, 21 Oct 2011 00:11:08 +0000 (02:11 +0200)]
fix shared lib build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Oct 2011 23:27:28 +0000 (01:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (47 commits)
  lavc: hide private symbols.
  lavc: deprecate img_get_alpha_info().
  lavc: use avpriv_ prefix for ff_toupper4.
  lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
  lavc: use avpriv_ prefix for ff_ac3_parse_header.
  lavc: use avpriv_ prefix for ff_frame_rate_tab.
  lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
  lavc: use avpriv_ prefix for ff_split_xiph_headers.
  lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
  lavc: use avpriv_ prefix for some dv symbols used in lavf.
  lavc: use avpriv_ prefix for some flac symbols used in lavf.
  lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
  lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
  lavc: use avpriv_ prefix for ff_aac_parse_header().
  lavf: hide private symbols.
  lavf: use avpriv_ prefix for some dv functions.
  lavf: use avpriv_ prefix for ff_new_chapter().
  avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
  avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
  avcodec: clarify documentation of CODEC_CAP_DELAY
  ...

Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/dv.c
libavcodec/dvdata.c
libavcodec/dvdata.h
libavcodec/libspeexenc.c
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/avidec.c
libavformat/dv.c
libavformat/dv.h
libavformat/flvenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/oggparsespeex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from...
Michael Niedermayer [Thu, 20 Oct 2011 22:36:00 +0000 (00:36 +0200)]
swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: remove unused variable.
Michael Niedermayer [Thu, 20 Oct 2011 22:34:37 +0000 (00:34 +0200)]
swr: remove unused variable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: Fix assignment discards qualifiers from pointer target type warning.
Michael Niedermayer [Thu, 20 Oct 2011 22:33:04 +0000 (00:33 +0200)]
swr: Fix assignment discards qualifiers from pointer target type warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoresample2: Fix passing argument from incompatible pointer type warnings.
Michael Niedermayer [Thu, 20 Oct 2011 22:31:20 +0000 (00:31 +0200)]
resample2: Fix passing argument from incompatible pointer type warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: Mark src as const in swr_resample()
Michael Niedermayer [Thu, 20 Oct 2011 22:30:41 +0000 (00:30 +0200)]
swr: Mark src as const in swr_resample()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorematrix: Fix several passing argument from incompatible pointer type warnings.
Michael Niedermayer [Thu, 20 Oct 2011 22:28:03 +0000 (00:28 +0200)]
rematrix: Fix several passing argument from incompatible pointer type warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopresets: spelling error in libvpx 1080p50_60
Lou Logan [Thu, 20 Oct 2011 19:08:50 +0000 (11:08 -0800)]
presets: spelling error in libvpx 1080p50_60

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: reallocate SDL overlays for OSX when changing full screen
Marton Balint [Thu, 20 Oct 2011 18:34:20 +0000 (20:34 +0200)]
ffplay: reallocate SDL overlays for OSX when changing full screen

Fixes missing blue channel when switching from/to fullscren on OSX and libsdl
1.2.14. Fixes issue 548. Thanks for Jean First for the original patch and
for testing.

Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoaacdec:only overwrite configuration if theres a actual change.
Michael Niedermayer [Thu, 20 Oct 2011 19:57:52 +0000 (21:57 +0200)]
aacdec:only overwrite configuration if theres a actual change.
Fixes Ticket574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: hide private symbols.
Anton Khirnov [Mon, 17 Oct 2011 08:13:16 +0000 (10:13 +0200)]
lavc: hide private symbols.

Overhead as reported by rbelf-size goes from 90860 to 20204.

8 years agolavc: deprecate img_get_alpha_info().
Anton Khirnov [Mon, 17 Oct 2011 18:08:02 +0000 (20:08 +0200)]
lavc: deprecate img_get_alpha_info().

It's never been touched or used in any way since it was added in 2003
and only works for PIX_FMT_PAL8, which makes me conclude that nobody's
ever used it.

8 years agolavc: use avpriv_ prefix for ff_toupper4.
Anton Khirnov [Mon, 17 Oct 2011 08:12:51 +0000 (10:12 +0200)]
lavc: use avpriv_ prefix for ff_toupper4.

It's used in lavf.

8 years agolavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
Anton Khirnov [Mon, 17 Oct 2011 08:10:42 +0000 (10:10 +0200)]
lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.

They are used in lavf.

8 years agolavc: use avpriv_ prefix for ff_ac3_parse_header.
Anton Khirnov [Mon, 17 Oct 2011 08:04:12 +0000 (10:04 +0200)]
lavc: use avpriv_ prefix for ff_ac3_parse_header.

It's used in lavf.

8 years agolavc: use avpriv_ prefix for ff_frame_rate_tab.
Anton Khirnov [Mon, 17 Oct 2011 07:59:31 +0000 (09:59 +0200)]
lavc: use avpriv_ prefix for ff_frame_rate_tab.

It's used in lavf.