Commit Graph

41479 Commits

Author SHA1 Message Date
Michael Niedermayer 4bfee465e9 bprint-test: avoid z modifier, mingw fails with it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:49:31 +02:00
Michael Niedermayer d35c27db63 sink_buffer: dont return void from void functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:30:12 +02:00
Michael Niedermayer 3b196bb737 libavcodec/x86/rv40dsp_init.c: add missing HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:26:24 +02:00
Michael Niedermayer 915ec91e6b libavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:23:44 +02:00
Michael Niedermayer 63bfee8796 libavcodec/x86/dwt.c: move some missed things under HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:20:27 +02:00
Michael Niedermayer b84c9cf7f7 dct-test: fix #if for ff_prores_idct_put_10_sse2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:15:38 +02:00
Michael Niedermayer 7b0d362567 libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.
Its only used through the start_frame pointer and thus cannot be inlined easily.
It also appears to break compilation with some unidentified compiler on darwin.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 03:08:19 +02:00
Michael Niedermayer 8836b41a78 fate-acodec-dca2: add bitexact flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 02:57:45 +02:00
Michael Niedermayer fd8da83d55 enc_dec_pcm: add bitexact flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 02:57:25 +02:00
Michael Niedermayer 8f1b139c10 cmdutils: dont return void from a void function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 02:38:01 +02:00
Michael Niedermayer dfaf2dd956 h264: use externally provided dimensions when they appear to be more correct.
This is based on:
	commit 30f515091c
	Author: Mans Rullgard <mans@mansr.com>
    		h264: allow cropping to AVCodecContext.width/height

The above commit is not taken as is as its buggy (incorrect handling of
the interlaced case) and didnt apply cleanly.

Fixes ticket156

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 02:24:25 +02:00
Paul B Mahol 3275981207 libopenjpegdec: make use of FF_ARRAY_ELEMS
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 23:34:15 +00:00
James Zern 695e85f189 libvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping
defines 'max-intra-rate' in line with vpxenc param

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10 01:18:42 +02:00
Stefano Sabatini 53dfc38452 lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE 2012-06-10 00:37:02 +02:00
Paul B Mahol 1ef5561a66 libopenjpeg: YUVA422P and YUVA444P support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 18:36:56 +00:00
Michael Niedermayer 75f8f70221 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
	libavcodec/h264.c
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 20:30:17 +02:00
Paul B Mahol 8554e21f79 ffv1enc: add yuva422p to .pix_fmts
This was forgotten in 4e4634aa16.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 18:15:50 +00:00
Michael Niedermayer 94632dbb1e Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 20:09:56 +02:00
J. Bohl 2138bc16fd remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 20:09:43 +02:00
Paul B Mahol a474403229 libopenjpegdec: unbreak yuva420p support
Regression introduced in b7a928b2d1.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 18:06:09 +00:00
Marton Balint 143a5390bf ffplay: fix return value of get_video_frame if avcodec_decode_video fails
Signed-off-by: Marton Balint <cus@passwd.hu>
2012-06-09 19:45:10 +02:00
Paul B Mahol 7655cc395d colorspace-test: add few more tests
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 14:38:51 +00:00
Michael Niedermayer b0415287e3 float_dsp.c: Restore author attribution that was removed by libav while moving code to libavutil
Original code comes from:
commit eb4825b5d4
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 0bde73d907
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue May 17 19:02:43 2005 +0000

    Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 16:09:47 +02:00
Michael Niedermayer f0313e9022 x86/float_dsp.asm: restore author attribution
The attribution was removed by libav while moving the code to libavutil

The original code is from
commit eb4825b5d4
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 069720565c
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Fri Aug 11 18:19:37 2006 +0000

    vorbis simd tweaks

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 16:09:11 +02:00
Mans Rullgard 30f515091c h264: allow cropping to AVCodecContext.width/height
Override the frame size from the SPS with AVCodecContext values
if the latter specify a size smaller by less than one macroblock.
This is required for correct cropping of MOV files from Canon cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-09 15:08:52 +01:00
Mans Rullgard 8aa93e9004 mov: set AVCodecContext.width/height for h264
This is required for correct cropping of files from Canon
cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-09 15:08:51 +01:00
Michael Niedermayer 1b7a4c93a9 lavc/bintext: check extradata size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 15:04:12 +02:00
Michael Niedermayer c61c8536ef lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 14:36:41 +02:00
Michael Niedermayer eae983f4ff ffmpeg: fix fate breakage introduced by key=value buffersrc args.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 14:02:27 +02:00
Paul B Mahol 1d69dcb887 swscale: unscaled rgb48 <-> bgr48
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 11:55:52 +00:00
Paul B Mahol e400b95b32 bink: check av_mallocz() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 10:57:14 +00:00
Paul B Mahol c2dd01c16f binkaudio: prevent extradata overread
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-09 10:43:20 +00:00
Nicolas George 6fef82f22d ffmpeg: with filter_complex, avoid random in<->out mapping.
With complex filters, an output can come from any input,
or several inputs, including inputs of a different type.
Copying the codec parameters from the first input with
the same type does not make any sense.

This does not change anything for simple 1->1 filters,
as source_index is set in that case.
2012-06-09 08:42:50 +02:00
Nicolas George fbaa8fe6c6 ffmpeg: init icodec.
With complex filter graphs, it can end up accessed
without having been set.
2012-06-09 08:42:50 +02:00
Nicolas George 8362d734a3 ffmpeg: use the frame rate computed by lavfi.
This frame rate is more reliable than the one copied
from the input stream, so it is used in priority.
2012-06-09 08:42:50 +02:00
Nicolas George 5f281e94ba ffmpeg: add frame rate to the buffersrc arguments.
The arguments now use the key=value syntax.
2012-06-09 08:42:50 +02:00
Nicolas George 0f62125643 buffersrc: deprecate flat options syntax. 2012-06-09 08:42:50 +02:00
Nicolas George 9ca440679d buffersrc: accept the frame rate as argument. 2012-06-09 08:42:50 +02:00
Nicolas George dcaa4efcee buffersrc: accept key=value arguments.
The current flat arguments syntax is not easily extensible
due to sws_param possibly containing commas.
This is also consistent with abuffersrc.
2012-06-09 08:42:50 +02:00
Nicolas George 283cc05938 buffersink: add av_buffersink_get_frame_rate(). 2012-06-09 08:42:50 +02:00
Nicolas George 7b42036b3b lavfi: add a frame_rate field to AVFilterLink. 2012-06-09 08:42:50 +02:00
Kostya Shishkov cac4760bf4 iac: generate codec tables as they are supposed to be
Unlike its predecessor, Indeo Audio codec generates tables depending on
sampling rate. Previously decoder used pre-generated tables for 22050 Hz
which obviously doesn't work with other frequencies.

Many thanks to Maxim Poliakovsky for providing all needed information
for this.
2012-06-09 08:38:51 +02:00
Kostya Shishkov e1a3fa5d3a indeo4: handle frame type 1 properly
It turns out that this frame type is actually intra and should be used as
a reference for interframes too.
2012-06-09 08:38:31 +02:00
Michael Niedermayer 04e2ac4749 libavutil.v: add avpriv prefix
This should fix the fate failure
http://fate.ffmpeg.org/log.cgi?time=20120609002213&log=compile&slot=x86_64-archlinux-gcc-enableshared

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 02:51:02 +02:00
Michael Niedermayer a5c6349358 swr: skip memset(0) in rematrix when the array is known to be already 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 02:43:10 +02:00
Michael Niedermayer 75d900d52e swr: zero buffers on allocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 02:42:46 +02:00
J. Bohl 023c073076 add bracket around the argument (fixes compilation error with ICL)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 00:34:21 +02:00
Michael Niedermayer 690ea9359d Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: reset AVFrame to defaults before decoding each new frame.
  ffplay: check return code of avcodec_decode_video2()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 00:28:20 +02:00
Michael Niedermayer 7e22514d98 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  float_dsp: ppc: add a separate header for Altivec function prototypes
  ARM: fix float_dsp breakage from d5a7229
  Add a float DSP framework to libavutil
  PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
  ARM: Move asm.S from libavcodec to libavutil
  vc1dsp: mark put/avg_vc1_mspel_mc() always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-08 23:59:09 +02:00
Michael Niedermayer e016e3c9d7 swr: add mix8to2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-08 22:12:00 +02:00