OSDN Git Service
Reimar Döffinger [Thu, 24 Mar 2011 20:27:05 +0000 (21:27 +0100)]
ac3dec: avoid pointless alloc and indirection for input_buffer
Since we now always allocate it, it can simply be made part of the context
instead.
Michael Niedermayer [Tue, 6 Sep 2011 16:20:34 +0000 (18:20 +0200)]
mjpegdec; even better RSTn skiping
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 14:22:38 +0000 (16:22 +0200)]
pngdec: Fix interlaced PAETH prediction
Fixes Ticket161
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 13:48:01 +0000 (15:48 +0200)]
pngdec: Implement 2bpp
Fixes Ticket433
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 13:28:36 +0000 (15:28 +0200)]
pngdec: Fix interlaced 1bpp
Fixes Ticket214
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 6 Sep 2011 11:35:15 +0000 (13:35 +0200)]
pngdec: 4bpp support
Fixes Ticket208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 6 Sep 2011 09:46:57 +0000 (11:46 +0200)]
mpeg12: cosmetics: reformat as K&R
Michael Niedermayer [Tue, 6 Sep 2011 02:09:43 +0000 (04:09 +0200)]
mpeg4: fix another packed divx issue.
Fixes getting_stuck.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Sep 2011 22:49:23 +0000 (00:49 +0200)]
ffmpeg: map subtitle stream by default when user specified -scodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Sep 2011 21:01:49 +0000 (23:01 +0200)]
vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore
Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Sep 2011 20:10:26 +0000 (22:10 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
wavpack: fix wrong return value in wavpack_decode_block()
avconv: fix parsing metadata specifiers.
fate: use +frame+slice named constants instead of '3'
mpeg12: propagate more real return values through chunk decode error return and fix some indentation
wavpack: use context reset in appropriate places
avconv: move mux_preload and mux_max_delay to options context
avconv: move bitstream filters to options context.
avconv: move rate_emu to options context.
avconv: move max_frames to options context.
avconv: move metadata to options context.
avconv: move ts scale to options context.
avconv: move chapter maps to options context.
avconv: move metadata maps to options context.
avconv: move codec_names to options context.
Conflicts:
avconv.c
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Sep 2011 16:42:44 +0000 (18:42 +0200)]
swscale: Fix unused asm and enable it
Author of the fix is ronald, the enabling & commit message are mine.
This fixes
commit
4e3e333a79272944b40695166438359b376d7864
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date: Tue Jul 5 12:49:11 2011 -0700
swscale: error dithering for 16/9/10-bit to 8-bit.
Based on a somewhat similar idea in FFmpeg's swscale copy.
The Fix was originally commited in: (and i missed it due to the commit message)
commit
5c391a161a1f71dcdafd3f59b45d80220845f501
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date: Fri Jul 8 14:39:04 2011 -0700
swscale: rename uv_off/uv_off2 to uv_off_px/byte.
Justin Ruggles [Sun, 7 Aug 2011 21:47:42 +0000 (17:47 -0400)]
ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
Update FATE references accordingly.
Justin Ruggles [Sun, 7 Aug 2011 21:51:13 +0000 (17:51 -0400)]
ac3enc: scale floating-point coupling channel coefficients in
scale_coefficients() rather than in apply_channel_coupling()
Justin Ruggles [Fri, 26 Aug 2011 17:02:29 +0000 (13:02 -0400)]
ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
The number of rematrixing bands still needs to be calculated.
Kostya Shishkov [Mon, 5 Sep 2011 10:37:50 +0000 (12:37 +0200)]
wavpack: fix wrong return value in wavpack_decode_block()
This function should return number of samples decoded, not number of bytes
decoded.
Spotted by Uoti Urpala.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Anton Khirnov [Mon, 5 Sep 2011 09:39:09 +0000 (11:39 +0200)]
avconv: fix parsing metadata specifiers.
After
039267f192f335144d9251e6f05a1513dd1e8ef1, metadata specifiers are
passed without the leading ':'. Remove a ++ that didn't take this into
account.
Anton Khirnov [Sun, 4 Sep 2011 08:01:59 +0000 (10:01 +0200)]
fate: use +frame+slice named constants instead of '3'
Dustin Brody [Sat, 3 Sep 2011 19:38:17 +0000 (15:38 -0400)]
mpeg12: propagate more real return values through chunk decode error return and fix some indentation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Kostya Shishkov [Fri, 2 Sep 2011 09:37:39 +0000 (11:37 +0200)]
wavpack: use context reset in appropriate places
This fixes improper flushing in the cases when the same frame is decoded in
several iterations (for being too large to fit into output buffer) and flush is
called mid-decoding and it also resets context in case of decoding errors.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Wed, 31 Aug 2011 06:51:15 +0000 (08:51 +0200)]
avconv: move mux_preload and mux_max_delay to options context
Anton Khirnov [Wed, 31 Aug 2011 06:45:25 +0000 (08:45 +0200)]
avconv: move bitstream filters to options context.
Change syntax -- -[vas]bsf are replaced by -bsf:[stream specifier], the
argument is now a comma-separated list of bitstream filters.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move rate_emu to options context.
Make it work properly with multiple input files.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move max_frames to options context.
Add a -frames option that uses generic stream specifiers, change
-[vad]frames into aliases to it.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move metadata to options context.
It is now possible to set metadata on streams and chapters.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move ts scale to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move chapter maps to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move metadata maps to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move codec_names to options context.
Michael Niedermayer [Mon, 5 Sep 2011 03:16:44 +0000 (05:16 +0200)]
vf_drawtext: make strftime work without localtime_r()
modern OS should have localtime_r() or return thread locals on localtime() hopefully
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Sep 2011 01:11:18 +0000 (03:11 +0200)]
ffmpeg: tell reset_options() if it is used on input or output files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 5 Sep 2011 00:04:27 +0000 (02:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: fix type for thread_type option
avconv: move format to options context
avconv: move limit_filesize to options context
avconv: move start_time, recording_time and input_ts_offset to options context
avconv: add a context for options.
cmdutils: allow storing per-stream/chapter/.... options in a generic way
cmdutils: split per-option code out of parse_options().
cmdutils: add support for caller-provided option context.
cmdutils: declare only one pointer type in OptionDef
cmdutils: move grow_array() from avconv to cmdutils.
cmdutils: move exit_program() declaration to cmdutils from avconv
http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
nutenc: add namespace to the api facing functions
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 4 Sep 2011 18:47:17 +0000 (20:47 +0200)]
vf_drawtext: Fix reinit to allow color changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 17 Jul 2011 13:22:36 +0000 (15:22 +0200)]
Check extradata size on resolution change.
Ignore resolution change if resolution not defined in extradata.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anton Khirnov [Sun, 4 Sep 2011 07:56:47 +0000 (09:56 +0200)]
lavc: fix type for thread_type option
It should be flags, not int.
Anton Khirnov [Sun, 28 Aug 2011 16:20:17 +0000 (18:20 +0200)]
avconv: move format to options context
Anton Khirnov [Sun, 28 Aug 2011 16:20:17 +0000 (18:20 +0200)]
avconv: move limit_filesize to options context
Anton Khirnov [Sun, 28 Aug 2011 16:20:17 +0000 (18:20 +0200)]
avconv: move start_time, recording_time and input_ts_offset to options context
Anton Khirnov [Sun, 28 Aug 2011 15:21:56 +0000 (17:21 +0200)]
avconv: add a context for options.
Move stream maps to it.
Eventually all non-global options should be stored in it.
Anton Khirnov [Mon, 29 Aug 2011 05:54:56 +0000 (07:54 +0200)]
cmdutils: allow storing per-stream/chapter/.... options in a generic way
Anton Khirnov [Mon, 29 Aug 2011 06:11:03 +0000 (08:11 +0200)]
cmdutils: split per-option code out of parse_options().
This allows options like -target, which are just shortcuts for other
options, to work without dummy function for all options they invoke.
Anton Khirnov [Sun, 28 Aug 2011 12:43:54 +0000 (14:43 +0200)]
cmdutils: add support for caller-provided option context.
This is the first step to removing the globals plague from avtools.
Anton Khirnov [Sun, 28 Aug 2011 12:27:27 +0000 (14:27 +0200)]
cmdutils: declare only one pointer type in OptionDef
This will be useful in the following commit.
Anton Khirnov [Mon, 29 Aug 2011 05:11:57 +0000 (07:11 +0200)]
cmdutils: move grow_array() from avconv to cmdutils.
Anton Khirnov [Mon, 29 Aug 2011 05:03:24 +0000 (07:03 +0200)]
cmdutils: move exit_program() declaration to cmdutils from avconv
Allows cmdutils to call each tool's own cleanup function.
Stefan Fritsch [Sun, 4 Sep 2011 08:56:24 +0000 (10:56 +0200)]
http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
The initial request contains "Range: 0-", which servers normally
have responded with "HTTP/1.1 206 Partial Content" reply with
a Content-Range header, which was used as indicator for seekability.
Apache, since 2.2.20, responds with "HTTP/1.1 200 OK" for these
requests, which is more friendly to caches and proxies, but the
seekability still is indicated via the Accept-Ranges: bytes header.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Wed, 31 Aug 2011 17:27:17 +0000 (19:27 +0200)]
nutenc: add namespace to the api facing functions
Rename write_{header,packet,trailer} to nut_write_{header,packet,trailer}
in order to make easier debugging them.
Clément Bœsch [Sat, 3 Sep 2011 17:51:28 +0000 (19:51 +0200)]
av_string: add av_asprintf().
Michael Niedermayer [Sun, 4 Sep 2011 02:11:53 +0000 (04:11 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
AVOptions: fix av_set_string3() doxy to match reality.
cmdutils: get rid of dummy contexts for examining AVOptions.
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
cpu detection: avoid a signed overflow
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
libavcodec/options.c
libavcodec/version.h
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Sep 2011 22:24:06 +0000 (00:24 +0200)]
ffmpeg: fix reading from stdin on windows
Based on code by Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefan Fritsch [Sat, 3 Sep 2011 20:29:07 +0000 (22:29 +0200)]
http: Fix decetion of range support in HTTP servers
currently libavformat only allows seeking if a request with "Range:
0-" results in a 206 reply from the HTTP server which includes a
Content-Range header. But according to RFC 2616, the server may also
reply with a normal 200 reply (which is more efficient for a request
for the whole file). In fact Apache HTTPD 2.2.20 has changed the
behaviour in this way and it looks like this change will be kept in
future versions. The fix for libavformat is easy: Also look at the
Accept-Ranges header.
Anton Khirnov [Tue, 23 Aug 2011 05:46:51 +0000 (07:46 +0200)]
AVOptions: fix av_set_string3() doxy to match reality.
Fixes bug 28.
Anton Khirnov [Tue, 23 Aug 2011 05:43:54 +0000 (07:43 +0200)]
cmdutils: get rid of dummy contexts for examining AVOptions.
Replace it with newly introduced libavutil API.
Anton Khirnov [Tue, 23 Aug 2011 05:23:52 +0000 (07:23 +0200)]
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
Anton Khirnov [Tue, 23 Aug 2011 05:11:26 +0000 (07:11 +0200)]
AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
It allows to search for options only with AVClass, without allocating
the corresponding context.
Sean McGovern [Mon, 25 Jul 2011 22:51:02 +0000 (18:51 -0400)]
cpu detection: avoid a signed overflow
1<<31 overflows because 1 is signed, so force it to unsigned.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Sat, 3 Sep 2011 02:48:43 +0000 (04:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
codec-regression: force vsync 0 on the me_threshold test to make sure frames match.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Sep 2011 22:15:15 +0000 (00:15 +0200)]
cmdutils: revert avconv rename of pathes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Sep 2011 21:49:07 +0000 (23:49 +0200)]
Revert "ffmpeg: remove presets." and reimplement the needed parts that no longer exist.
Needed by libvpx
This reverts commit
a0147957e70aecd9d3e06f69a53d26456f061fc9.
Alexander Strasser [Tue, 30 Aug 2011 23:25:13 +0000 (01:25 +0200)]
doc: issue tracking: explain the term issue
Transforms the loose enumeration of issues that was to far below
in the text into a more verbose paragraph at the top. The new text
also mentions the possibility to propose new types of issues to
track on the development mailing list.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Alexander Strasser [Tue, 30 Aug 2011 23:24:06 +0000 (01:24 +0200)]
doc: issue tracking: add more vertical whitespace
This change makes the first part of the file easier to read quickly.
It makes it also easier to spot the URLs which might be one of the main
interests of many readers.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Alexander Strasser [Tue, 30 Aug 2011 23:23:42 +0000 (01:23 +0200)]
doc: issue tracking: fix grammar/spelling
Correct a few grammar and spelling errors. Also improve consistency
by always referring to substatus (not substate).
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Tomas Härdin [Mon, 7 Feb 2011 15:07:41 +0000 (16:07 +0100)]
Parse MXF partitions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Sep 2011 16:00:31 +0000 (18:00 +0200)]
mpeg4: adjust dummy frame threashold for packed divx.
Fixes Ticket427
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Sep 2011 03:28:31 +0000 (05:28 +0200)]
openal-dec: fix missing list_devices unit for list_devices AVOption
Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Sep 2011 03:21:25 +0000 (05:21 +0200)]
dvdec: Fix dvsd profile[1] detection.
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Wed, 31 Aug 2011 20:57:01 +0000 (13:57 -0700)]
codec-regression: force vsync 0 on the me_threshold test to make sure frames match.
Michael Niedermayer [Thu, 1 Sep 2011 23:18:22 +0000 (01:18 +0200)]
Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"
This broke mplayer
This reverts commit
a18e04bcf989a9d7f5629c573f9d70f8a020c7a7.
Chiranjeevi Melam [Thu, 1 Sep 2011 22:16:19 +0000 (00:16 +0200)]
ffmpeg: Fix minor memleak of input_tmp
Michael Niedermayer [Thu, 1 Sep 2011 21:43:56 +0000 (23:43 +0200)]
jpegdec: better rst skiping
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 28 Aug 2011 18:54:11 +0000 (20:54 +0200)]
Remove unused variables.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 29 Aug 2011 19:48:31 +0000 (21:48 +0200)]
Autodetect PowerPC vs. PowerPC64.
This is the same code as for x86_64.
This is necessary because uname returns PPC64 if the hardware
is 64 bit, however the userland can still be fully 32 bit.
In that case FFmpeg fails to compile because some macros in the
asm code are set up incorrectly.
For details see https://bugs.gentoo.org/show_bug.cgi?id=341235
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 27 Aug 2011 13:06:37 +0000 (15:06 +0200)]
Do not free BITMAPINFOHEADER before we are done using it.
Fixes trac ticket #396.
Completely untested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 27 Aug 2011 12:37:14 +0000 (14:37 +0200)]
MJPEG: emulate EOI also on two consecutive SOI.
Fixes issue #362.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 27 Aug 2011 19:55:57 +0000 (21:55 +0200)]
Reset cur_scan at more appropriate places.
Reset it when we actually process an EOI, not when we actually
decide to ignore it for bug-workarounds, and reset it on
SOF to make it more reliable in case of missing EOI.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Clément Bœsch [Thu, 1 Sep 2011 20:09:15 +0000 (22:09 +0200)]
ffprobe: directly use va args in print fmt callbacks.
Michael Niedermayer [Thu, 1 Sep 2011 20:08:03 +0000 (22:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix some bugs introduced in
630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
libmp3lame: fix typo
AVOptions: drop av_ prefix from static av_get_number().
libx264: use X264_THREADS_AUTO constant instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 1 Sep 2011 18:25:32 +0000 (20:25 +0200)]
resample: fix typo (ouput → output).
Clément Bœsch [Mon, 29 Aug 2011 15:52:16 +0000 (17:52 +0200)]
Makefile: remove unused PROGS_G.
Clément Bœsch [Mon, 29 Aug 2011 15:52:03 +0000 (17:52 +0200)]
build: introduce --progs-suffix option.
Clément Bœsch [Thu, 1 Sep 2011 18:06:05 +0000 (20:06 +0200)]
wav: init st to NULL to avoid a false-positive warning.
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.
Clément Bœsch [Thu, 1 Sep 2011 00:56:59 +0000 (02:56 +0200)]
cmdutils: fix uninitialized variable (type) warning.
Clément Bœsch [Thu, 1 Sep 2011 00:54:27 +0000 (02:54 +0200)]
sws: fix a huge amount of incompatible pointer type arguments warnings.
Clément Bœsch [Thu, 1 Sep 2011 00:27:38 +0000 (02:27 +0200)]
ffmpeg: fix two unused variables warnings.
Clément Bœsch [Thu, 1 Sep 2011 00:15:39 +0000 (02:15 +0200)]
resample: fix set but unused variable (lfe) warning.
Clément Bœsch [Thu, 1 Sep 2011 00:01:54 +0000 (02:01 +0200)]
imgconvert: avoid mixed declarations and code.
Carl Eugen Hoyos [Thu, 1 Sep 2011 17:03:39 +0000 (19:03 +0200)]
Fix compilation with --disable-avfilter.
Fixes ticket #425.
Gavin Kinsey [Thu, 1 Sep 2011 14:18:22 +0000 (16:18 +0200)]
jpegdec: set color_range
Michael Niedermayer [Thu, 1 Sep 2011 01:46:04 +0000 (03:46 +0200)]
avconv: fix some bugs introduced in
630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 1 Sep 2011 08:17:09 +0000 (10:17 +0200)]
libmp3lame: fix typo
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS
Thanks to Clément Bœsch for spotting.
Anton Khirnov [Tue, 23 Aug 2011 08:27:49 +0000 (10:27 +0200)]
AVOptions: drop av_ prefix from static av_get_number().
Anton Khirnov [Wed, 31 Aug 2011 17:26:01 +0000 (19:26 +0200)]
libx264: use X264_THREADS_AUTO constant instead of 0.
Michael Niedermayer [Thu, 1 Sep 2011 01:46:04 +0000 (03:46 +0200)]
ffmpeg: Fix typos introduced in:
commit
630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
Author: Anton Khirnov <anton@khirnov.net>
Date: Wed Jul 6 08:49:07 2011 +0200
avconv: factor out initializing input streams.
These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Sep 2011 00:38:56 +0000 (02:38 +0200)]
vc1: loose one line difference to qatar.
This should make no functional difference.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Sep 2011 00:12:15 +0000 (02:12 +0200)]
mpeg4: fix typo in mpeg4_encode_gop_header()
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 29 Apr 2011 15:27:01 +0000 (17:27 +0200)]
Replace some commented-out debug printf() / av_log() messages with av_dlog().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 31 Aug 2011 23:18:56 +0000 (01:18 +0200)]
APIchanges: remove "deprecate url_feof"
url_feof() is usefull when a file is appended to
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 31 Aug 2011 21:44:21 +0000 (23:44 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
libx264: set default thread count to 0 (auto)
lavc: cosmetics, group deprecated codec flags
mpeg12: add 'scan_offset' private option.
h263/p encoder: add 'structured_slices' private option.
h263/p encoder: add 'obmc' private option.
h263p encoder: add 'aiv' private option.
h263p encoder: add 'umv' private option.
mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
mjpegdec: add 'extern_huff' private option.
mpeg4enc: add 'data_partitioning' private option.
snow: add 'memc_only' private option.
libx264: add 'mbtree' private option.
libx264: add 'psy' private option.
libmp3lame: add 'reservoir' private option.
mpeg2enc: add 'non_linear_quant' private option
mpeg12enc: add drop_frame_timecode private option.
mpeg12enc: add intra_vlc private option.
VC1: Support dynamic dimension changes
mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
lavc: deprecate CODEC_FLAG2_BRDO
...
Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/libx264.c
libavcodec/mjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.h
libavcodec/vc1.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 31 Aug 2011 12:04:02 +0000 (14:04 +0200)]
libx264: set default thread count to 0 (auto)
Stefano Sabatini [Mon, 29 Aug 2011 16:46:06 +0000 (18:46 +0200)]
vsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref()