ffmpeg.git
9 years agoWTV muxer (1_extract_wtv_common_code.patch)
zhentan feng [Tue, 23 Aug 2011 13:40:58 +0000 (21:40 +0800)]
WTV muxer (1_extract_wtv_common_code.patch)

9 years agoflvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream
Asad Mehmood [Wed, 7 Sep 2011 22:18:07 +0000 (23:18 +0100)]
flvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream

If there is only 1 stream in an flv avformat_find_stream_info will continually
read until probesize is reached. This should stop it reading if the metadata
also claims there to be 1 stream.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Sep 2011 20:32:59 +0000 (22:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavformat/version.h
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortpdec_asf: fix memleak
Michael Niedermayer [Wed, 7 Sep 2011 14:48:49 +0000 (16:48 +0200)]
rtpdec_asf: fix memleak

Based on a suggestion by Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortp: Fix integer underflow that could allow remote code execution.
Michael Niedermayer [Wed, 7 Sep 2011 12:12:42 +0000 (14:12 +0200)]
rtp: Fix integer underflow that could allow remote code execution.

Fixes MSVR-11-0088
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd LATM muxer
Kieran Kunhya [Tue, 6 Sep 2011 19:05:27 +0000 (20:05 +0100)]
Add LATM muxer

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agov210enc: clip values according to specifications
Baptiste Coudurier [Sun, 8 May 2011 15:58:20 +0000 (17:58 +0200)]
v210enc: clip values according to specifications

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agov210enc: switch to PIX_FMT_422P10
Baptiste Coudurier [Sun, 8 May 2011 15:57:54 +0000 (17:57 +0200)]
v210enc: switch to PIX_FMT_422P10

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agov210dec: switch to PIX_FMT_422P10
Baptiste Coudurier [Sun, 8 May 2011 15:54:20 +0000 (17:54 +0200)]
v210dec: switch to PIX_FMT_422P10

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoAVOptions: remove AVOption.offset <= 0 checks
Anton Khirnov [Mon, 5 Sep 2011 19:44:33 +0000 (21:44 +0200)]
AVOptions: remove AVOption.offset <= 0 checks

They will only ever be <=0 if the option is broken, in which case this
check is hiding a bug.

9 years agoAVOptions: deprecate av_opt_set_defaults2
Anton Khirnov [Sun, 4 Sep 2011 09:42:41 +0000 (11:42 +0200)]
AVOptions: deprecate av_opt_set_defaults2

It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.

9 years agoAVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
Anton Khirnov [Sun, 4 Sep 2011 09:39:49 +0000 (11:39 +0200)]
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h

Also change it to be more readable.

9 years agolibx264: fix setting some more parameters
Anton Khirnov [Wed, 7 Sep 2011 07:13:02 +0000 (09:13 +0200)]
libx264: fix setting some more parameters

Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.

9 years agolibx264: fix setting the H.264 level
Andrej Peterka [Wed, 7 Sep 2011 06:27:28 +0000 (08:27 +0200)]
libx264: fix setting the H.264 level

Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolibx264: add 'direct-pred' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'direct-pred' private option

Deprecate AVCodecContext.directpred

9 years agolibx264: add 'partitions' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'partitions' private option

Deprecate AVCodecContext.partitions.

9 years agoCorrect docs for boxblur parameters
Mark Himsley [Tue, 6 Sep 2011 20:30:18 +0000 (21:30 +0100)]
Correct docs for boxblur parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoflvdec: A little bit of cleanup
Joseph Wecker [Sat, 27 Aug 2011 00:50:33 +0000 (17:50 -0700)]
flvdec: A little bit of cleanup

9 years agoflvenc: Correctly encode data stream into in-band metadata frames.
Joseph Wecker [Sat, 27 Aug 2011 00:42:22 +0000 (17:42 -0700)]
flvenc: Correctly encode data stream into in-band metadata frames.

9 years agoflvdec: Properly decoding in-band metadata packets as data frames.
Joseph Wecker [Sat, 27 Aug 2011 00:39:11 +0000 (17:39 -0700)]
flvdec: Properly decoding in-band metadata packets as data frames.

9 years agoflvdec: Started to remove most of the "only 1-audio+1-video" assumptions
Joseph Wecker [Fri, 26 Aug 2011 01:36:32 +0000 (18:36 -0700)]
flvdec: Started to remove most of the "only 1-audio+1-video" assumptions

9 years agoflv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster.
Joseph Wecker [Thu, 25 Aug 2011 21:04:37 +0000 (14:04 -0700)]
flv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster.

9 years agoSupport Speex in isom.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:19:02 +0000 (00:19 +0200)]
Support Speex in isom.

Adobe Flash Media Server produces such files although the f4v
specification does not allow Speex (nor Nellymoser).

9 years agoFix decoding of 2/4 bpp Tiff samples.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:17:02 +0000 (00:17 +0200)]
Fix decoding of 2/4 bpp Tiff samples.

9 years agoCosmetics: Fix comment.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:03:13 +0000 (00:03 +0200)]
Cosmetics: Fix comment.

9 years agolibavformat/utils: only run delta_dts_min calculation code when its value is used.
Michael Niedermayer [Tue, 6 Sep 2011 22:23:18 +0000 (00:23 +0200)]
libavformat/utils: only run delta_dts_min calculation code when its value is used.
This should improve speed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/utils: use FFMIN() where possible
Michael Niedermayer [Tue, 6 Sep 2011 22:13:09 +0000 (00:13 +0200)]
libavformat/utils: use FFMIN() where possible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds have...
wg [Tue, 6 Sep 2011 22:10:44 +0000 (00:10 +0200)]
libavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds have passed without a packet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter: dont crash on filters with NULL instance names.
Michael Niedermayer [Tue, 6 Sep 2011 20:16:26 +0000 (22:16 +0200)]
avfilter: dont crash on filters with NULL instance names.

Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Sep 2011 19:35:18 +0000 (21:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
libavcodec/libx264.c
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodshow: properly disconnect and remove filters from graph
Ramiro Polla [Fri, 2 Sep 2011 04:35:47 +0000 (01:35 -0300)]
dshow: properly disconnect and remove filters from graph

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodshow: remove some unused code
Ramiro Polla [Fri, 2 Sep 2011 04:33:24 +0000 (01:33 -0300)]
dshow: remove some unused code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovfwcap: actually use framerate option
Ramiro Polla [Fri, 2 Sep 2011 04:33:07 +0000 (01:33 -0300)]
vfwcap: actually use framerate option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibx264: add 'cplxblur' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'cplxblur' private option

Deprecate AVCodecContext.complexityblur

9 years agolibx264: add 'deblock' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'deblock' private option

Deprecate AVCodecContext.deblockalpha/deblockbeta

9 years agolibx264: add 'b-bias' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'b-bias' private option

Deprecate AVCodecContext.bframebias.

9 years agolibx264: fix setting some options.
Anton Khirnov [Thu, 1 Sep 2011 10:59:29 +0000 (12:59 +0200)]
libx264: fix setting some options.

Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.

Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.

Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.

9 years agolibx264: remove useless assignment
Anton Khirnov [Wed, 31 Aug 2011 12:09:19 +0000 (14:09 +0200)]
libx264: remove useless assignment

priv_data is memset to 0.

9 years agopngdec: implement 4bpp interlaced
Michael Niedermayer [Tue, 6 Sep 2011 17:02:14 +0000 (19:02 +0200)]
pngdec: implement 4bpp interlaced
Fixes Ticket435

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopngdec: implement 2 bpp interlaced.
Michael Niedermayer [Tue, 6 Sep 2011 16:46:42 +0000 (18:46 +0200)]
pngdec: implement 2 bpp interlaced.
Fixes Ticket434

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h
Stefano Sabatini [Tue, 6 Sep 2011 16:37:44 +0000 (18:37 +0200)]
lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

This is done in order to clarify the non-video-specific nature of the
buffersink code, as the result of the video/audio API unification of
the previous commit, and for improving overall consistency.

9 years agolavfi: unify asink_buffer and vsink_buffer API
Stefano Sabatini [Thu, 18 Aug 2011 14:21:47 +0000 (16:21 +0200)]
lavfi: unify asink_buffer and vsink_buffer API

The new API is more generic (no distinction between audio/video for
pulling frames), and avoids code duplication.

A backward compatibility layer is kept for avoiding tools ABI breaks
(only for the video binary interface, audio interface was never used
in the tools).

9 years agoac3dec: avoid pointless alloc and indirection for input_buffer
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.

9 years agomjpegdec; even better RSTn skiping
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>
9 years agopngdec: Fix interlaced PAETH prediction
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>
9 years agopngdec: Implement 2bpp
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>
9 years agopngdec: Fix interlaced 1bpp
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>
9 years agopngdec: 4bpp support
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>
9 years agompeg12: cosmetics: reformat as K&R
Diego Biurrun [Tue, 6 Sep 2011 09:46:57 +0000 (11:46 +0200)]
mpeg12: cosmetics: reformat as K&R

9 years agompeg4: fix another packed divx issue.
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>
9 years agoffmpeg: map subtitle stream by default when user specified -scodec
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>
9 years agovf_drawtext: always use expanded_text as we always support strftime() now and dont...
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>
9 years agoMerge remote-tracking branch 'qatar/master'
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>
9 years agoswscale: Fix unused asm and enable it
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.

9 years agoac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
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.

9 years agoac3enc: scale floating-point coupling channel coefficients in
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()

9 years agoac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
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.

9 years agowavpack: fix wrong return value in wavpack_decode_block()
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>
9 years agoavconv: fix parsing metadata specifiers.
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.

9 years agofate: use +frame+slice named constants instead of '3'
Anton Khirnov [Sun, 4 Sep 2011 08:01:59 +0000 (10:01 +0200)]
fate: use +frame+slice named constants instead of '3'

9 years agompeg12: propagate more real return values through chunk decode error return and fix...
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>
9 years agowavpack: use context reset in appropriate places
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>
9 years agoavconv: move mux_preload and mux_max_delay to options context
Anton Khirnov [Wed, 31 Aug 2011 06:51:15 +0000 (08:51 +0200)]
avconv: move mux_preload and mux_max_delay to options context

9 years agoavconv: move bitstream filters 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.

9 years agoavconv: move rate_emu to options context.
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.

9 years agoavconv: move max_frames to options context.
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.

9 years agoavconv: move metadata to options context.
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.

9 years agoavconv: move ts scale to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move ts scale to options context.

9 years agoavconv: move chapter maps to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move chapter maps to options context.

9 years agoavconv: move metadata maps to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move metadata maps to options context.

9 years agoavconv: move codec_names to options context.
Anton Khirnov [Mon, 29 Aug 2011 07:16:42 +0000 (09:16 +0200)]
avconv: move codec_names to options context.

9 years agovf_drawtext: make strftime work without localtime_r()
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>
9 years agoffmpeg: tell reset_options() if it is used on input or output files.
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>
9 years agoMerge remote-tracking branch 'qatar/master'
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>
9 years agovf_drawtext: Fix reinit to allow color changes.
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>
9 years agoCheck extradata size on resolution change.
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>
9 years agolavc: fix type for thread_type option
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.

9 years agoavconv: move format to options context
Anton Khirnov [Sun, 28 Aug 2011 16:20:17 +0000 (18:20 +0200)]
avconv: move format to options context

9 years agoavconv: move limit_filesize to options context
Anton Khirnov [Sun, 28 Aug 2011 16:20:17 +0000 (18:20 +0200)]
avconv: move limit_filesize to options context

9 years agoavconv: move start_time, recording_time and input_ts_offset 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

9 years agoavconv: add a context for options.
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.

9 years agocmdutils: allow storing per-stream/chapter/.... options in a generic way
Anton Khirnov [Mon, 29 Aug 2011 05:54:56 +0000 (07:54 +0200)]
cmdutils: allow storing per-stream/chapter/.... options in a generic way

9 years agocmdutils: split per-option code out of parse_options().
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.

9 years agocmdutils: add support for caller-provided option context.
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.

9 years agocmdutils: declare only one pointer type in OptionDef
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.

9 years agocmdutils: move grow_array() from avconv to cmdutils.
Anton Khirnov [Mon, 29 Aug 2011 05:11:57 +0000 (07:11 +0200)]
cmdutils: move grow_array() from avconv to cmdutils.

9 years agocmdutils: move exit_program() declaration to cmdutils from avconv
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.

9 years agohttp: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
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>
9 years agonutenc: add namespace to the api facing functions
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.

9 years agoav_string: add av_asprintf().
Clément Bœsch [Sat, 3 Sep 2011 17:51:28 +0000 (19:51 +0200)]
av_string: add av_asprintf().

9 years agoMerge remote-tracking branch 'qatar/master'
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>
9 years agoffmpeg: fix reading from stdin on windows
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>
9 years agohttp: Fix decetion of range support in HTTP servers
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.

9 years agoAVOptions: fix av_set_string3() doxy to match reality.
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.

9 years agocmdutils: get rid of dummy contexts for examining AVOptions.
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.

9 years agolavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
Anton Khirnov [Tue, 23 Aug 2011 05:23:52 +0000 (07:23 +0200)]
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.

9 years agoAVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
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.

9 years agocpu detection: avoid a signed overflow
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>
9 years agoMerge remote-tracking branch 'qatar/master'
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>
9 years agocmdutils: revert avconv rename of pathes
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>