OSDN Git Service
Michael Niedermayer [Fri, 15 Jul 2011 15:40:51 +0000 (17:40 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Fri, 15 Jul 2011 05:59:46 +0000 (15:59 +1000)]
wtvdec: also support big-sectors when fat depth is zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 15 Jul 2011 07:53:12 +0000 (10:53 +0300)]
configure: Automatically add more flags required on symbian
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Thu, 14 Jul 2011 22:45:59 +0000 (00:45 +0200)]
mem.h: switch doxygen parameter order to match function prototype
Diego Biurrun [Thu, 14 Jul 2011 22:45:23 +0000 (00:45 +0200)]
doxygen: replace @sa tag by the more readable but equivalent @see
Diego Biurrun [Thu, 14 Jul 2011 01:56:07 +0000 (03:56 +0200)]
doxygen: use Doxygen markup for authors and web links where appropriate
Stefano Sabatini [Thu, 14 Jul 2011 23:29:24 +0000 (01:29 +0200)]
vf_mp: remove rgbtest wrapper
The filter was integrated natively into libavfilter as a source with
name rgbtestsrc.
Stefano Sabatini [Mon, 11 Jul 2011 14:27:09 +0000 (16:27 +0200)]
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
The licence was changed from GPL to LGPL with explicit approval from
the original author.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: add rgbtestsrc source,
ported from MPlayer libmpcodecs
Date: Mon, 11 Jul 2011 16:32:41 +0200
Stefano Sabatini [Mon, 11 Jul 2011 14:20:05 +0000 (16:20 +0200)]
vsrc_testsrc: perform some refactoring for simplifying sharing code with another test
In particular creates a special test_init function, which calls a
common init, and introduces a fill_picture_fn which points to the
filling function.
This is required by the pending patch for adding the rgbtestsrc
source.
Stefano Sabatini [Sat, 9 Jul 2011 16:23:02 +0000 (18:23 +0200)]
vf_mp: remove boxblur wrapper
It is natively included in libavfilter.
Diego Biurrun [Thu, 14 Jul 2011 01:11:19 +0000 (03:11 +0200)]
doxygen: do not include license boilerplate in Doxygen documentation
Martin Storsjö [Thu, 14 Jul 2011 21:21:15 +0000 (00:21 +0300)]
ac3enc: Mark AVClasses const
Signed-off-by: Martin Storsjö <martin@martin.st>
Mike Williams [Wed, 13 Jul 2011 18:24:47 +0000 (14:24 -0400)]
ffserver: Replace two loops with one loop.
Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Thu, 14 Jul 2011 20:01:29 +0000 (23:01 +0300)]
ffmpeg: Fix the check for experimental codecs
The variable 'codec' was used uninitialized here.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Thu, 14 Jul 2011 17:31:27 +0000 (10:31 -0700)]
swscale: extend mmx padding.
Fixes a crash when forcing libc to strictly adhere to malloc sizes.
Ronald S. Bultje [Thu, 14 Jul 2011 17:24:40 +0000 (10:24 -0700)]
swscale: clip unscaled colorspace conversion path.
Prevents overflows on very bright scenes when adding dither,
which may lead to black dots.
Michael Niedermayer [Thu, 14 Jul 2011 19:27:13 +0000 (21:27 +0200)]
cmdutils: remove #if 0-ed conflict marger trash that i forgot
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Jul 2011 19:22:12 +0000 (21:22 +0200)]
ffmpeg: loose lowres hackery
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 14 Jul 2011 02:05:17 +0000 (04:05 +0200)]
doxygen: misc consistency cosmetics
Diego Biurrun [Thu, 14 Jul 2011 01:54:10 +0000 (03:54 +0200)]
doc: remove file name from @file directive in Doxygen usage example
The file name is redundant and brittle across file renamings.
Diego Biurrun [Thu, 14 Jul 2011 01:46:19 +0000 (03:46 +0200)]
doxygen: consistently place brief description
Diego Biurrun [Thu, 14 Jul 2011 01:12:36 +0000 (03:12 +0200)]
doxygen: place empty line between brief description and detailed description
Without it, Doxygen cannot separate them into different sections.
Diego Biurrun [Thu, 7 Jul 2011 00:01:07 +0000 (02:01 +0200)]
avformat_open_input(): Add braces to shut up gcc warning.
libavformat/utils.c:599: warning: missing braces around initializer
libavformat/utils.c:599: warning: (near initialization for ‘ap.time_base’)
Michael Niedermayer [Thu, 14 Jul 2011 18:44:58 +0000 (20:44 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
APIchanges: fill in missing hashes and dates.
Add an APIChanges entry and bump minor versions for recent changes.
ffmpeg: print the low bitrate warning after the codec is openend.
doxygen: Move function documentation into the macro generating the function.
doxygen: Make sure parameter names match between .c and .h files.
h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
H.264: Add more x86 assembly for 10-bit H.264 predict functions
lavf: fix invalid reads in avformat_find_stream_info()
cmdutils: replace opt_default with opt_default2() and remove set_context_opts
ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
ffplay: use new avcodec_open2 and avformat_find_stream_info API.
cmdutils: store all codec options in one dict instead of video/audio/sub
ffmpeg: check experimental flag after codec is opened.
ffmpeg: do not set GLOBAL_HEADER flag in the options context
Conflicts:
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/version.h
libavformat/version.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 15 Jun 2011 05:34:12 +0000 (07:34 +0200)]
ffmpeg: deprecate -vc and -tvstd
They've been replaced by demuxer private options.
55ba12e3009fd6c8f78102f7c747496d500d0bac
Anton Khirnov [Thu, 9 Jun 2011 08:58:23 +0000 (10:58 +0200)]
Michael Niedermayer [Thu, 14 Jul 2011 15:49:29 +0000 (17:49 +0200)]
seektest: forgot adding a file (from commit
191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0 during the last merge)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 14 Jul 2011 08:43:24 +0000 (10:43 +0200)]
APIchanges: fill in missing hashes and dates.
Anton Khirnov [Thu, 14 Jul 2011 08:09:05 +0000 (10:09 +0200)]
Add an APIChanges entry and bump minor versions for recent changes.
Anton Khirnov [Thu, 14 Jul 2011 07:38:36 +0000 (09:38 +0200)]
ffmpeg: print the low bitrate warning after the codec is openend.
This doesn't access avcodec_opts, so it works with the new options
passing system.
Makes opt_bitrate() unneeded, so it's removed.
Diego Biurrun [Mon, 4 Jul 2011 10:33:11 +0000 (12:33 +0200)]
doxygen: Move function documentation into the macro generating the function.
This fixes a bunch of related warnings where Doxygen assumed that the
documentation belonged to the macro and not the function.
Diego Biurrun [Sat, 2 Jul 2011 12:47:34 +0000 (14:47 +0200)]
doxygen: Make sure parameter names match between .c and .h files.
Diego Biurrun [Wed, 13 Jul 2011 19:51:23 +0000 (21:51 +0200)]
h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
This fixes a bunch of unused function warnings.
Daniel Kang [Mon, 11 Jul 2011 21:26:43 +0000 (17:26 -0400)]
H.264: Add more x86 assembly for 10-bit H.264 predict functions
Mainly ported from 8-bit H.264 predict.
Some code ported from x264. LGPL ok by author.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Thu, 14 Jul 2011 01:08:53 +0000 (03:08 +0200)]
lavf: fix invalid reads in avformat_find_stream_info()
Michael Niedermayer [Thu, 14 Jul 2011 00:22:48 +0000 (02:22 +0200)]
Merge commit '
b5849f77095439e994b11c25e6063d443b36c228'
* commit '
b5849f77095439e994b11c25e6063d443b36c228': (21 commits)
ac3enc: merge AC3MDCTContext with AC3EncodeContext.
ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
ac3enc: fix memleak
mpeg1video: add CODEC_CAP_SLICE_THREADS.
lavf: fix segfault in av_open_input_stream()
mpegtsenc: set Random Access indicator on keyframe start packets
lavf: Cleanup try_decode_frame() logic.
Replace some gotos that lead to single return statements by direct return.
build: move tests/seek_test.c to libavformat and reuse generic build rules
mxfenc: include needed header for ff_iso8601_to_unix_time() prototype
Add a check for strptime().
lavf: factor out conversion of ISO8601 string to unix time
wav: parse 'bext' metadata
wav: keep parsing until EOF if the input is seekable and we know the size of the data tag
wav: Refactor the tag checking into a switch statement
wav: make sure neither data_size nor sample_count is negative.
wav: refactor the 'fmt ' tag search and parsing.
wav: add an option for writing BEXT chunk
ffmpeg: get rid of a pointless limit on number of streams.
ffmpeg: remove an unused define.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 9 Jul 2011 16:13:10 +0000 (18:13 +0200)]
lavfi: port boxblur filter from libmpcodecs
With the following additions:
* support to gray format
* support to yuva420p format
* parametric luma/chroma/alpha radius
* consistency check on the radius values, avoid crashes with invalid values
Anton Khirnov [Wed, 25 May 2011 15:30:23 +0000 (17:30 +0200)]
cmdutils: replace opt_default with opt_default2() and remove set_context_opts
Anton Khirnov [Wed, 25 May 2011 15:29:25 +0000 (17:29 +0200)]
ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
Anton Khirnov [Wed, 25 May 2011 14:59:51 +0000 (16:59 +0200)]
ffplay: use new avcodec_open2 and avformat_find_stream_info API.
Anton Khirnov [Sun, 10 Jul 2011 13:46:15 +0000 (15:46 +0200)]
cmdutils: store all codec options in one dict instead of video/audio/sub
Split them when codec id is known.
Anton Khirnov [Tue, 12 Jul 2011 15:18:42 +0000 (17:18 +0200)]
ffmpeg: check experimental flag after codec is opened.
This doesn't access avcodec_opts, so it will work with the new options
passing system.
Anton Khirnov [Tue, 12 Jul 2011 14:18:45 +0000 (16:18 +0200)]
ffmpeg: do not set GLOBAL_HEADER flag in the options context
The removed lines have no effect, since the flag is set on all encoder
for the given file and avcodec_opts are reset between files.
Justin Ruggles [Wed, 13 Jul 2011 19:12:11 +0000 (15:12 -0400)]
ac3enc: merge AC3MDCTContext with AC3EncodeContext.
Since both the fixed-point and floating-point encoders use the FFTContext,
this no longer needs to be in a separate context. Also, when a short-transform
context is added, the same MDCT window will be used.
Justin Ruggles [Wed, 13 Jul 2011 17:53:58 +0000 (13:53 -0400)]
ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext
Justin Ruggles [Wed, 13 Jul 2011 19:49:08 +0000 (15:49 -0400)]
ac3enc: fix memleak
Ronald S. Bultje [Wed, 29 Jun 2011 21:13:17 +0000 (14:13 -0700)]
mpeg1video: add CODEC_CAP_SLICE_THREADS.
Anton Khirnov [Tue, 12 Jul 2011 20:42:18 +0000 (22:42 +0200)]
lavf: fix segfault in av_open_input_stream()
ic is NULL in case of error.
Jindrich Makovicka [Wed, 29 Jun 2011 13:01:39 +0000 (15:01 +0200)]
mpegtsenc: set Random Access indicator on keyframe start packets
Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alex Converse [Tue, 12 Jul 2011 22:13:29 +0000 (15:13 -0700)]
lavf: Cleanup try_decode_frame() logic.
This fixes AAC playback in ffplay.
Diego Biurrun [Mon, 11 Jul 2011 14:32:54 +0000 (16:32 +0200)]
Replace some gotos that lead to single return statements by direct return.
Diego Biurrun [Wed, 13 Jul 2011 00:09:19 +0000 (02:09 +0200)]
build: move tests/seek_test.c to libavformat and reuse generic build rules
Kostya Shishkov [Wed, 13 Jul 2011 11:21:00 +0000 (12:21 +0100)]
mxfenc: include needed header for ff_iso8601_to_unix_time() prototype
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Wed, 13 Jul 2011 07:30:06 +0000 (09:30 +0200)]
Add a check for strptime().
It's an XSI extension, not available on some supported systems.
Anton Khirnov [Wed, 13 Jul 2011 09:45:17 +0000 (11:45 +0200)]
lavf: factor out conversion of ISO8601 string to unix time
Tomas Härdin [Wed, 18 May 2011 11:48:39 +0000 (13:48 +0200)]
wav: parse 'bext' metadata
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tomas Härdin [Wed, 18 May 2011 11:48:02 +0000 (13:48 +0200)]
wav: keep parsing until EOF if the input is seekable and we know the size of the data tag
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tomas Härdin [Thu, 17 Feb 2011 14:58:10 +0000 (15:58 +0100)]
wav: Refactor the tag checking into a switch statement
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tomas Härdin [Tue, 17 May 2011 17:52:36 +0000 (19:52 +0200)]
wav: make sure neither data_size nor sample_count is negative.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tomas Härdin [Tue, 17 May 2011 17:46:08 +0000 (19:46 +0200)]
wav: refactor the 'fmt ' tag search and parsing.
Moving the search and parsing of the 'fmt ' info the main loop of
wav_read_header() allows tags that precede it to be parsed. Creating
wav_parse_fmt_tag() makes wav_read_header() easier to read.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Benjamin Larsson [Fri, 18 Mar 2011 00:00:15 +0000 (00:00 +0000)]
wav: add an option for writing BEXT chunk
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 9 Jul 2011 14:49:44 +0000 (16:49 +0200)]
ffmpeg: get rid of a pointless limit on number of streams.
Anton Khirnov [Sat, 9 Jul 2011 14:48:47 +0000 (16:48 +0200)]
ffmpeg: remove an unused define.
Kostya Shishkov [Mon, 11 Jul 2011 13:13:39 +0000 (15:13 +0200)]
Musepack SV7: try to read files without number of frames provided
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Tue, 12 Jul 2011 22:42:11 +0000 (00:42 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Improve references to external URLs.
h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
dnxhdenc: Replace a forward declaration by the proper #include.
h264: move h264_mvpred.h include.
pix_fmt: Fix number of bits per component in yuv444p9be
lavf: deprecate AVFormatContext.timestamp
ffmpeg: merge input_files_ts_scale into InputStream.
ffmpeg: don't abuse a global for passing sample format from input to output
ffmpeg: don't abuse a global for passing channel layout from input to output
ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
matroskaenc: make SSA default subtitle codec.
oggdec: prevent heap corruption.
Conflicts:
doc/developer.texi
doc/faq.texi
doc/general.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 8 Jul 2011 13:33:17 +0000 (15:33 +0200)]
doc: Improve references to external URLs.
Sometimes it makes sense to replace a raw URL with some informative text
that links to the URL instead of using the raw URL itself in the text.
Also transform some mailing list references into links.
Diego Biurrun [Tue, 12 Jul 2011 18:36:50 +0000 (20:36 +0200)]
h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
This resolves a circular dependency between the headers.
Diego Biurrun [Mon, 11 Jul 2011 15:04:15 +0000 (17:04 +0200)]
ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
This fixes some warnings about unused-but-set variables.
Reimar Döffinger [Mon, 11 Jul 2011 18:35:02 +0000 (20:35 +0200)]
Move resetting of channels, sample_rate back to av_find_stream_info.
Resetting it on codec init would incorrectly clear the values
if av_find_stream_info was already run before, in particular
breaking ffplay.
This fixes trac tickets #213 and #262.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Fri, 8 Jul 2011 13:29:57 +0000 (15:29 +0200)]
dnxhdenc: Replace a forward declaration by the proper #include.
Carl Eugen Hoyos [Tue, 12 Jul 2011 15:35:20 +0000 (17:35 +0200)]
Support adpcm_ima_wav and adpcm_ms in caf.
Ronald S. Bultje [Tue, 12 Jul 2011 15:15:55 +0000 (08:15 -0700)]
h264: move h264_mvpred.h include.
Fixes the following compile error with darwin/gcc-4.2.1:
In file included from libavcodec/error_resilience.c:33:
libavcodec/h264.h: In function ‘decode_mb_skip’:
libavcodec/h264.h:773: error: ‘always_inline’ function could not be inlined in call to ‘pred_pskip_motion’: the function body must appear before caller
libavcodec/h264.h:1334: error: called from here
Oskar Arvidsson [Tue, 12 Jul 2011 08:52:19 +0000 (10:52 +0200)]
pix_fmt: Fix number of bits per component in yuv444p9be
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Carl Eugen Hoyos [Tue, 12 Jul 2011 14:09:10 +0000 (16:09 +0200)]
Add another MP3 CAF codec tag.
Anton Khirnov [Thu, 7 Jul 2011 09:25:03 +0000 (11:25 +0200)]
lavf: deprecate AVFormatContext.timestamp
It's replaced by 'creation_time' metadata tag.
Anton Khirnov [Thu, 7 Jul 2011 06:54:07 +0000 (08:54 +0200)]
ffmpeg: merge input_files_ts_scale into InputStream.
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing sample format from input to output
It's broken with multiple files or audio streams.
Anton Khirnov [Wed, 15 Jun 2011 06:00:03 +0000 (08:00 +0200)]
ffmpeg: don't abuse a global for passing channel layout from input to output
It's broken with multiple files or audio streams.
Anton Khirnov [Sat, 25 Jun 2011 05:43:49 +0000 (07:43 +0200)]
ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
Anton Khirnov [Fri, 24 Jun 2011 19:34:42 +0000 (21:34 +0200)]
matroskaenc: make SSA default subtitle codec.
It's a better format and we have an encoder for it, so it doesn't fail
like CODEC_ID_TEXT.
Dominique Leuenberger [Mon, 11 Jul 2011 18:33:45 +0000 (20:33 +0200)]
RELEASE: We are git after 0.8 release
Michael Niedermayer [Mon, 11 Jul 2011 23:42:32 +0000 (01:42 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
changelog: misc typo and wording fixes
H.264: add filter_mb_fast support for >8-bit decoding
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
lls: use av_lfg instead of rand() in test program
build: remove unnecessary dependency on libs from 'all' target
H.264: avoid redundant alpha/beta calculations in loopfilter
H.264: optimize intra/inter loopfilter decision
mpegts: fix Continuity Counter error detection
build: remove unnecessary FFLDFLAGS variable
vp8/mt: flush worker thread, not application thread context, on seek.
mt: proper locking around release_buffer calls.
DxVA2: unbreak build after [
657ccb5ac75ce34e62bd67f228d9bd36db72189e]
hwaccel: unbreak build
Eliminate FF_COMMON_FRAME macro.
Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Chris Evans [Wed, 29 Jun 2011 22:44:40 +0000 (15:44 -0700)]
oggdec: prevent heap corruption.
Specifically crafted samples can reinit ogg->streams[] while
reading samples, and thus we should not cache old pointers since
these may no longer be valid.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diego Biurrun [Sat, 9 Jul 2011 15:43:53 +0000 (17:43 +0200)]
changelog: misc typo and wording fixes
Jason Garrett-Glaser [Mon, 11 Jul 2011 21:46:37 +0000 (14:46 -0700)]
H.264: add filter_mb_fast support for >8-bit decoding
Much faster high bit depth deblocking.
Diego Biurrun [Sat, 9 Jul 2011 18:15:29 +0000 (20:15 +0200)]
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
Mans Rullgard [Fri, 8 Jul 2011 14:01:05 +0000 (15:01 +0100)]
lls: use av_lfg instead of rand() in test program
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 11 Jul 2011 19:53:15 +0000 (20:53 +0100)]
build: remove unnecessary dependency on libs from 'all' target
The libs are added to the all target elsewhere, no need to do it
again here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Jason Garrett-Glaser [Sun, 10 Jul 2011 09:25:53 +0000 (02:25 -0700)]
H.264: avoid redundant alpha/beta calculations in loopfilter
Jason Garrett-Glaser [Sun, 10 Jul 2011 08:28:50 +0000 (01:28 -0700)]
H.264: optimize intra/inter loopfilter decision
Jindrich Makovicka [Thu, 30 Jun 2011 09:03:15 +0000 (09:03 +0000)]
mpegts: fix Continuity Counter error detection
According to MPEG-TS specs, the continuity_counter shall not be
incremented when the adaptation_field_control of the packet
equals '00' or '10'.
Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mans Rullgard [Sun, 10 Jul 2011 21:01:41 +0000 (22:01 +0100)]
build: remove unnecessary FFLDFLAGS variable
This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Mon, 11 Jul 2011 04:23:09 +0000 (21:23 -0700)]
vp8/mt: flush worker thread, not application thread context, on seek.
This prevents a crash when seeking.
Ronald S. Bultje [Mon, 11 Jul 2011 00:28:28 +0000 (17:28 -0700)]
mt: proper locking around release_buffer calls.
This fixes a crash when seeking in some webm files with many
threads (e.g. 8).
Michael Niedermayer [Mon, 11 Jul 2011 03:46:51 +0000 (05:46 +0200)]
Revert "lavc: remove a half-working attempt at different defaults for audio/video codecs."
This reverts commit
18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26.
Michael Niedermayer [Mon, 11 Jul 2011 02:23:25 +0000 (04:23 +0200)]
Merge commit '
142e76f1055de5dde44696e71a5f63f2cb11dedf'
* commit '
142e76f1055de5dde44696e71a5f63f2cb11dedf':
swscale: fix crash with dithering due incorrect offset calculation.
matroskadec: fix stupid typo (!= -> ==)
build: remove duplicates from order-only directory prerequisite list
build: rework rules for things in the tools dir
configure: fix --cpu=host with gcc 4.6
ARM: use const macro to define constant data in asm
bitdepth: simplify FUNC/FUNCC macros
dsputil: remove ff_emulated_edge_mc macro used in one place
9/10-bit: simplify clipping macros
matroskadec: reindent
matroskadec: defer parsing of cues element until we seek.
lavc: add support for codec-specific defaults.
lavc: make avcodec_alloc_context3 officially public.
lavc: remove a half-working attempt at different defaults for audio/video codecs.
ac3dec: add a drc_scale private option
lavf: add avformat_find_stream_info()
lavc: introduce avcodec_open2() as a replacement for avcodec_open().
Conflicts:
Makefile
libavcodec/utils.c
libavformat/avformat.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Jul 2011 02:00:41 +0000 (04:00 +0200)]
Merge branch 'sws_32bit_integration'
* sws_32bit_integration:
regtests/sws: update checksums for recent changes
sws: dont mess with XInc when the code needing it isnt used
sws: Fix chroma init for 32bit buffers.
swscale: error dithering for 16/9/10-bit to 8-bit.
swscale: fix overflow in 16-bit vertical scaling.
swscale: fix crash in 8-bpc bilinear output without alpha.
swscale: fix 16-bit scaling when output is 8-bits.
sws: fix non native endian 9-15 bit input with 16bit out
sws: disable scale16 when int32 is used
sws: fix rgb -> 16bit
sws: fix uv overwrite in 32bt
sws: fix gray16_1
sws:ix yuv2rgb48_1_c_template()
sws: fix 16/32 bug from merge
swscale: for >8bit scaling, read in native bit-depth.
swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit
81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit
e0b8fff6c7a293e35079ba1931bd19372686b3f6)
swscale: implement >8bit scaling support.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Jul 2011 01:54:30 +0000 (03:54 +0200)]
regtests/sws: update checksums for recent changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jul 2011 23:44:23 +0000 (01:44 +0200)]
sws: dont mess with XInc when the code needing it isnt used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Jul 2011 13:58:24 +0000 (15:58 +0200)]
sws: Fix chroma init for 32bit buffers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>