OSDN Git Service
Michael Niedermayer [Sun, 17 Jul 2011 12:05:03 +0000 (14:05 +0200)]
Revert "Do not decode RV30 files if the extradata is too small"
This commit is plain wrong, theres no reason to error out at this point nor is the
error value guranteed to be negative as it should be
This reverts commit
289c60001fb0a9a1d7a97c876d8a42b84c6874ac.
Michael Niedermayer [Sat, 16 Jul 2011 17:40:35 +0000 (19:40 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
Remove commented-out call to non-existing function print_pow1().
Do not decode RV30 files if the extradata is too small
flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
ppc: remove disabled code
libspeexdec: Drop const qualifier to silence compiler warning.
libopenjpeg: Drop const qualifier to silence compiler warning.
alac: Remove unused dummy code.
Remove unused structs and tables.
vaapi: do not assert on value read from input bitstream
flashsvenc: replace bitstream description by a link to the specification
flashsvenc: drop unnecessary cast
flashsvenc: improve some variable names and fix corresponding comments
flashsvenc: merge two consecutive if-conditions
flashsvenc: merge variable declarations and initializations
flashsvenc: convert some debug av_log() to av_dlog()
flashsvenc: whitespace cosmetics
flashsvenc: drop some unnecessary parentheses
flashsvenc: fix some comment typos
aacps: skip some memcpy() if src and dst would be equal
...
Conflicts:
libavcodec/vaapi_mpeg2.c
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Jul 2011 17:24:10 +0000 (19:24 +0200)]
Revert "ffmpeg: get rid of a pointless limit on number of streams."
This reverts commit
c7dd3e7e43555b2922481a9242a306c5b138d69c
Conflicts:
ffmpeg.c
Mina Nagy Zaki [Tue, 28 Jun 2011 05:56:19 +0000 (08:56 +0300)]
lavfi: add audio channel packing negotiation fields
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Diego Biurrun [Sat, 16 Jul 2011 17:15:01 +0000 (19:15 +0200)]
arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
Diego Biurrun [Tue, 26 Apr 2011 14:57:55 +0000 (16:57 +0200)]
Remove commented-out call to non-existing function print_pow1().
Stefano Sabatini [Sat, 16 Jul 2011 16:49:39 +0000 (18:49 +0200)]
mpegvideo: fix compilation after
900321b08c95bd42e6db53864bfffbe48d6019da
Replace:
s->last_picture_ptr->f.key_frame = 0;
with:
s->last_picture_ptr->key_frame = 0;
This is required since mpegvideo.h:Picture now contains an embedded
AVFrame f, rather than a literal copy of the AVFrame fields.
Rafaël Carré [Sat, 16 Jul 2011 15:41:08 +0000 (11:41 -0400)]
Do not decode RV30 files if the extradata is too small
Signed-off-by: Diego Biurrun <diego@biurrun.de>
elupus [Fri, 22 Apr 2011 13:42:51 +0000 (15:42 +0200)]
Don't mark generated dummy frame output from mpeg1/2 decoder as keyframe.
We use this flag to tell when to assume decoded data is free
from artifacts after a seek. The mpeg1/2 decoder will generate
a dummy frame if decoding is started on a non keyframe. This
will sadly be output from decoder to player and displayed
as a gray screen.
Jernej Fijačko [Mon, 11 Jul 2011 08:11:04 +0000 (10:11 +0200)]
Patch for memory leaks in DVB subtitles decoder
Signed-off-by: Joakim Plate <elupus@ecce.se>
Diego Biurrun [Wed, 6 Jul 2011 21:53:32 +0000 (23:53 +0200)]
flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
Diego Biurrun [Fri, 15 Jul 2011 23:35:01 +0000 (01:35 +0200)]
ppc: remove disabled code
Diego Biurrun [Wed, 6 Jul 2011 23:31:03 +0000 (01:31 +0200)]
libspeexdec: Drop const qualifier to silence compiler warning.
libavcodec/libspeexdec.c:108: warning: passing argument 2 of ‘speex_bits_read_from’ discards qualifiers from pointer target type
/usr/include/speex/speex_bits.h:80: note: expected ‘char *’ but argument is of type ‘const uint8_t *’
Diego Biurrun [Wed, 6 Jul 2011 23:31:02 +0000 (01:31 +0200)]
libopenjpeg: Drop const qualifier to silence compiler warning.
libavcodec/libopenjpeg.c:100: warning: passing argument 2 of ‘opj_cio_open’ discards qualifiers from pointer target type
/usr/include/openjpeg.h:770: note: expected ‘unsigned char *’ but argument is of type ‘const uint8_t *’
Diego Biurrun [Fri, 29 Apr 2011 17:49:45 +0000 (19:49 +0200)]
alac: Remove unused dummy code.
Diego Biurrun [Fri, 29 Apr 2011 17:40:16 +0000 (19:40 +0200)]
Remove unused structs and tables.
Diego Biurrun [Thu, 14 Jul 2011 23:06:16 +0000 (01:06 +0200)]
vaapi: do not assert on value read from input bitstream
User-provided data should never trigger an assert; return error instead.
Also fix an instance of get_bits where get_bits_long should have been used.
This eliminates the following warning:
libavcodec/vaapi_mpeg2.c:112:14: warning: variable 'start_code' set but not used
Diego Biurrun [Fri, 15 Jul 2011 17:45:17 +0000 (19:45 +0200)]
flashsvenc: replace bitstream description by a link to the specification
An official specification now exists and it is both more detailed and
easier to understand than the incomplete notes available here.
Diego Biurrun [Fri, 15 Jul 2011 14:21:20 +0000 (16:21 +0200)]
flashsvenc: drop unnecessary cast
Diego Biurrun [Fri, 15 Jul 2011 13:55:19 +0000 (15:55 +0200)]
flashsvenc: improve some variable names and fix corresponding comments
Diego Biurrun [Fri, 15 Jul 2011 13:28:43 +0000 (15:28 +0200)]
flashsvenc: merge two consecutive if-conditions
Diego Biurrun [Fri, 15 Jul 2011 13:28:18 +0000 (15:28 +0200)]
flashsvenc: merge variable declarations and initializations
Diego Biurrun [Fri, 15 Jul 2011 13:26:49 +0000 (15:26 +0200)]
flashsvenc: convert some debug av_log() to av_dlog()
Diego Biurrun [Fri, 15 Jul 2011 13:26:18 +0000 (15:26 +0200)]
flashsvenc: whitespace cosmetics
Diego Biurrun [Fri, 15 Jul 2011 13:09:39 +0000 (15:09 +0200)]
flashsvenc: drop some unnecessary parentheses
Diego Biurrun [Fri, 15 Jul 2011 13:05:51 +0000 (15:05 +0200)]
flashsvenc: fix some comment typos
Mans Rullgard [Fri, 15 Jul 2011 21:38:10 +0000 (22:38 +0100)]
aacps: skip some memcpy() if src and dst would be equal
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Fri, 15 Jul 2011 18:27:43 +0000 (20:27 +0200)]
lavf/utils: drop av_ prefixes from static functions.
Anton Khirnov [Sat, 21 May 2011 17:13:22 +0000 (19:13 +0200)]
avio: don't replicate avio_alloc_context functionality.
Michael Niedermayer [Fri, 15 Jul 2011 16:27:30 +0000 (18:27 +0200)]
ffmpeg: fix muxer private options (bug introduced by anton khirnov)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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.