]>
git.sesse.net Git - ffmpeg/log
Marton Balint [Tue, 18 Oct 2011 23:08:41 +0000 (01:08 +0200)]
ffplay: consider estimated time of filter in early frame drop
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 16 Oct 2011 21:42:53 +0000 (23:42 +0200)]
ffplay: reimplement early frame drop
This patch reimplements early frame drop, it is now based on the current
difference between the master clock and the video clock, and the pts of the
current and the last displayed (or skipped) frame. If the frame to be added to
the queue is late after decoding, then we drop it early because later we would
drop it anyway (unless it is the only frame in the picture queue).
The current approach has only one downside that I know of, it does not handle
well when the filters are changing significantly the pts of the frames, because
we compare pts values from filtered and unfiltered frames.
We also start using the pictq_mutex to ensure consistent video_current_pts,
video_current_pts_drift, frame_last_pts, frame_last_dropped_pts and
frame_last_dropped_pos values.
Signed-off-by: Marton Balint <cus@passwd.hu>
Nicolas George [Mon, 24 Oct 2011 17:55:49 +0000 (19:55 +0200)]
libcelt_dec: set sample_fmt.
This fixes a regression introduced by the merging of patch
fc2dd2c .
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 27 Sep 2011 15:11:47 +0000 (17:11 +0200)]
mpegts: add BDMV secondary audio stream types
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Wed, 24 Aug 2011 19:50:04 +0000 (21:50 +0200)]
avcodec: add YCgCo color space.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 4 Feb 2011 22:45:15 +0000 (23:45 +0100)]
pcm_bluray: set bits_per_raw_sample for > 16-bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 24 Oct 2011 15:56:52 +0000 (17:56 +0200)]
mpegts: fix null-pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 24 Oct 2011 15:45:39 +0000 (17:45 +0200)]
vsrc_testsrc: increase log level from DEBUG to INFO for message in init()
Stefano Sabatini [Sun, 23 Oct 2011 11:53:25 +0000 (13:53 +0200)]
lavfi: rewrite nullsrc using the code in vsrc_testsrc.c
Factorize code, extend the functionality of the filter, and make it
return empty buffers. This is useful for filters which ignore the input
frames content.
This is also changing the syntax of the nullsrc source, and dropping the
framerate expression evaluation, which does not look particularly useful.
Mark Himsley [Mon, 24 Oct 2011 11:45:14 +0000 (12:45 +0100)]
filters.texi: document interlaced scaling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Mon, 24 Oct 2011 03:18:09 +0000 (19:18 -0800)]
docs: remove reference to enable-libavfilter
This is no longer a valid configure option.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Öman [Thu, 3 Mar 2011 08:31:34 +0000 (09:31 +0100)]
wmall: Working bitstream parser
(cherry picked from commit
929822111bc10fdf19ca66b7ed09e0ebf802878b )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 3 Sep 2011 06:31:53 +0000 (08:31 +0200)]
tools: add a tool for enumerating/printing AVOptions in texinfo format
(cherry picked from commit
e103cb3e9513949858ccf0ec44c5151239d397e9 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Oct 2011 10:23:51 +0000 (12:23 +0200)]
sws: replace long by x86_reg in x86 asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Oct 2011 10:17:24 +0000 (12:17 +0200)]
h264: Calculate a tighter recovery_frame.
Reduces delay with mplayers TS demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Oct 2011 10:16:03 +0000 (12:16 +0200)]
h264: Support invalid output by mplayers TS demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 23:34:38 +0000 (01:34 +0200)]
Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"
This reverts commit
da22ba7df461c13bf0b0eabc953303803a285d91 .
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Michael Niedermayer [Sun, 23 Oct 2011 23:04:14 +0000 (01:04 +0200)]
Revert "mpeg12: move closed_gop from MpegEncContext to Mpeg1Context"
This reverts commit
3fc08304322ce3ed0e4a71efde78ae5e0d5c910c .
The revert is done because the reasoning behind the commit was
flawed, closed_gop is not mpeg1/2 specific.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Michael Niedermayer [Sun, 23 Oct 2011 23:01:21 +0000 (01:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Move id3v2 tag writing to a separate file.
swscale: add missing colons to x86 assembly yuv2planeX.
g722: split decoder and encoder into separate files
cosmetics: remove extra spaces before end-of-statement semi-colons
vorbisdec: check output buffer size before writing output
wavpack: calculate bpp using av_get_bytes_per_sample()
ac3enc: Set max value for mode options correctly
lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
mpegvideo: remove some unused variables from MpegEncContext.
Conflicts:
libavcodec/mpeg12.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 23 Oct 2011 21:51:33 +0000 (23:51 +0200)]
vsrc_testsrc: do not assume non-padded lines in test_fill_picture()
In particular, fix sliding color bar with padded data, for example with
testsrc,pad=iw+200:ih.
Stefano Sabatini [Sun, 23 Oct 2011 16:57:07 +0000 (18:57 +0200)]
vf_boxblur: fix slice-drawing
This filter does not support slice-drawing, the whole blurred image needs
to be written in end_frame().
Michael Niedermayer [Sun, 23 Oct 2011 21:36:06 +0000 (23:36 +0200)]
sws: add yuv2yuvX_sse3()
Code is about 2x as fast as previous
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 21:35:28 +0000 (23:35 +0200)]
sws-test: Fix data alignment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 18:18:21 +0000 (20:18 +0200)]
sws: fix assert failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 18:15:37 +0000 (20:15 +0200)]
sws: x86_32 fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 17:19:57 +0000 (19:19 +0200)]
sws: add yuv2yuvX() back and updated to the just 1 plane API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 17:18:59 +0000 (19:18 +0200)]
sws: factorize v*Filter use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 17:16:59 +0000 (19:16 +0200)]
sws: port to thw new 1 plane API and add back yuv2yuv1_ar().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 17:13:52 +0000 (19:13 +0200)]
sws: better MOVNTQ macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 12:08:42 +0000 (14:08 +0200)]
sws cleanup yuv2planeX_10_c_template()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 12:01:32 +0000 (14:01 +0200)]
sws: remove nonsensical code that leaked in from libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Oct 2011 11:54:45 +0000 (13:54 +0200)]
sws: drop unused code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Karcher [Fri, 21 Oct 2011 21:32:32 +0000 (23:32 +0200)]
Move id3v2 tag writing to a separate file.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Ronald S. Bultje [Sun, 23 Oct 2011 16:34:36 +0000 (09:34 -0700)]
swscale: add missing colons to x86 assembly yuv2planeX.
This fixes assembling using "nasm".
Justin Ruggles [Sat, 22 Oct 2011 21:49:50 +0000 (17:49 -0400)]
g722: split decoder and encoder into separate files
Justin Ruggles [Sat, 24 Sep 2011 00:00:11 +0000 (20:00 -0400)]
cosmetics: remove extra spaces before end-of-statement semi-colons
Justin Ruggles [Fri, 23 Sep 2011 23:56:58 +0000 (19:56 -0400)]
vorbisdec: check output buffer size before writing output
Justin Ruggles [Sat, 24 Sep 2011 03:19:53 +0000 (23:19 -0400)]
wavpack: calculate bpp using av_get_bytes_per_sample()
John Stebbins [Sun, 23 Oct 2011 15:24:26 +0000 (11:24 -0400)]
ac3enc: Set max value for mode options correctly
for example:
Attempting to set ac3 dsur_mode to "on" results in:
[AC-3 Encoder @ 0x7f508f0a3280] Value 2.000000 for parameter 'dsur_mode' out of range
[AC-3 Encoder @ 0x7f508f0a3280] Error setting option dsur_mode to value on.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Sun, 23 Oct 2011 11:33:48 +0000 (13:33 +0200)]
Simplify some bits-left/overread checks.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anton Khirnov [Fri, 21 Oct 2011 14:02:29 +0000 (16:02 +0200)]
lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
It's not used anywhere else.
Anton Khirnov [Wed, 19 Oct 2011 07:28:45 +0000 (09:28 +0200)]
mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
It's MPEG-1/2 specific.
Anton Khirnov [Wed, 19 Oct 2011 07:28:45 +0000 (09:28 +0200)]
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
It's MPEG-1 specific.
Anton Khirnov [Wed, 19 Oct 2011 07:25:52 +0000 (09:25 +0200)]
mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
It will be used in vdpau code.
Anton Khirnov [Tue, 18 Oct 2011 17:53:25 +0000 (19:53 +0200)]
mpegvideo: remove some unused variables from MpegEncContext.
Michael Niedermayer [Sun, 23 Oct 2011 11:39:11 +0000 (13:39 +0200)]
lavc: add PIX_FMT_GBR24P to align_dimensions()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 22 Oct 2011 11:33:44 +0000 (13:33 +0200)]
Reuse vp3_decode_flush instead of duplicating it.
This also fixes that sometimes a frame would actually not be freed.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 23 Oct 2011 03:10:09 +0000 (05:10 +0200)]
swscale: disable functions that do not yet work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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 .
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>
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>
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>
Justin Ruggles [Fri, 23 Sep 2011 23:50:41 +0000 (19:50 -0400)]
twinvq: check output buffer size before decoding
Justin Ruggles [Fri, 23 Sep 2011 23:25:47 +0000 (19:25 -0400)]
twinvq: return an error when the packet size is too small
Anton Khirnov [Sat, 22 Oct 2011 19:08:31 +0000 (21:08 +0200)]
lavf: export some forgotten symbols with non-av prefixes.
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>
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>
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>
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>
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>
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>
Ronald S. Bultje [Sat, 15 Oct 2011 23:00:42 +0000 (16:00 -0700)]
swscale: update altivec yuv2planeX asm to new per-plane API.
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.
Kieran Kunhya [Sun, 9 Oct 2011 15:20:48 +0000 (16:20 +0100)]
yuv2planeX10 SIMD
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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.
Ronald S. Bultje [Wed, 5 Oct 2011 13:27:52 +0000 (06:27 -0700)]
swscale: reintroduce full precision in 16-bit output.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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.
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>
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>
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>
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>
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>
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>
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.
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>
Justin Ruggles [Fri, 21 Oct 2011 16:13:28 +0000 (12:13 -0400)]
libspeexdec: include system headers before local headers
Justin Ruggles [Fri, 21 Oct 2011 16:13:04 +0000 (12:13 -0400)]
libspeexdec: return meaningful error codes
Justin Ruggles [Fri, 21 Oct 2011 16:10:35 +0000 (12:10 -0400)]
libspeexdec: cosmetics: reindent
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.
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>
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>
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>
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>
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>
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>
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>
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.
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>