ffmpeg.git
6 years agoexamples/muxing: cast sws_scale() argument to the expected one
Stefano Sabatini [Tue, 21 Aug 2012 16:15:32 +0000 (18:15 +0200)]
examples/muxing: cast sws_scale() argument to the expected one

Fix warnings:
muxing.c: In function ‘write_video_frame’:
muxing.c:326:23: warning: passing argument 2 of ‘sws_scale’ from incompatible pointer type [enabled by default]

6 years agodoc/eval: add missing documentation of functions
Stefano Sabatini [Tue, 21 Aug 2012 11:16:13 +0000 (13:16 +0200)]
doc/eval: add missing documentation of functions

6 years agodoc/filters: itemize examples for pad filter, and fix a few typos
Stefano Sabatini [Tue, 21 Aug 2012 10:34:10 +0000 (12:34 +0200)]
doc/filters: itemize examples for pad filter, and fix a few typos

6 years agoavrn: lowercase "name" and expand"long_name"
Piotr Bandurski [Tue, 21 Aug 2012 19:48:13 +0000 (21:48 +0200)]
avrn: lowercase "name" and expand"long_name"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: Change default aac priming fallback from 2112 to 1024
Justin Greer [Tue, 21 Aug 2012 20:00:55 +0000 (22:00 +0200)]
mov: Change default aac priming fallback from 2112 to 1024

This fixes priming for faac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: parse custom "----" Metadata
Justin Greer [Tue, 21 Aug 2012 19:57:45 +0000 (21:57 +0200)]
mov: parse custom "----" Metadata

This fixes the priming samples for NERO AAC LC

Simplified-by: Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 21 Aug 2012 14:17:13 +0000 (16:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dirac: use meaningful return values
  flacdec: simplify sample buffer handling
  flacdec: simplify loop in decode_residuals()
  fate: make Ut Video encoder tests use bitexact swscale flags
  build: amrwb: Drop redundant lsp dependency declaration
  fate: fix utvideoenc tests

Conflicts:
libavcodec/dirac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodirac: use meaningful return values
Jordi Ortiz [Tue, 21 Aug 2012 13:09:40 +0000 (15:09 +0200)]
dirac: use meaningful return values

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavf: remove unused AVStream pointer.
Clément Bœsch [Tue, 21 Aug 2012 11:48:08 +0000 (13:48 +0200)]
lavf: remove unused AVStream pointer.

6 years agolavf: add const qualifier to AVCodecDescriptor pointer in is_intra_only().
Clément Bœsch [Tue, 21 Aug 2012 11:47:43 +0000 (13:47 +0200)]
lavf: add const qualifier to AVCodecDescriptor pointer in is_intra_only().

Fix "assignment discards ‘const’ qualifier from pointer target type" warnings.

6 years agoflacdec: simplify sample buffer handling
Mans Rullgard [Mon, 2 Jul 2012 00:59:04 +0000 (01:59 +0100)]
flacdec: simplify sample buffer handling

Pass pointer to sample buffer instead of channel number to various
functions called from decode_subframe().  Also simplify a few
expressions within this function.

6 years agoflacdec: simplify loop in decode_residuals()
Mans Rullgard [Mon, 2 Jul 2012 21:39:34 +0000 (22:39 +0100)]
flacdec: simplify loop in decode_residuals()

6 years agofate: make Ut Video encoder tests use bitexact swscale flags
Jan Ekström [Mon, 20 Aug 2012 18:16:42 +0000 (21:16 +0300)]
fate: make Ut Video encoder tests use bitexact swscale flags

The failures on various architectures and compilers on the RGB(A)
tests seem to have been because of one-off YCbCr->RGB conversion
results. This should make the conversion results match on most if
not all code paths.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodoc/ffmpeg: extend documentation for -(no)stdin option
Stefano Sabatini [Mon, 20 Aug 2012 23:42:47 +0000 (01:42 +0200)]
doc/ffmpeg: extend documentation for -(no)stdin option

Fix trac ticket #1665.

6 years agofate: make Ut Video encoder tests use bitexact swscale flags
Jan Ekström [Mon, 20 Aug 2012 18:16:42 +0000 (21:16 +0300)]
fate: make Ut Video encoder tests use bitexact swscale flags

The failures on various architectures and compilers on the RGB(A)
tests seem to have been because of one-off YCbCr->RGB conversion
results. This should make the conversion results match on most if
not all code paths.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agormdec: parse logical-fileinfo, instead of creating phantom tracks
Michael Niedermayer [Tue, 21 Aug 2012 04:15:22 +0000 (06:15 +0200)]
rmdec: parse logical-fileinfo, instead of creating phantom tracks

Fixes Ticket1090

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: pass mime type to ff_rm_read_mdpr_codecdata()
Michael Niedermayer [Tue, 21 Aug 2012 04:14:29 +0000 (06:14 +0200)]
rmdec: pass mime type to ff_rm_read_mdpr_codecdata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: factor ff_free_stream() out
Michael Niedermayer [Tue, 21 Aug 2012 04:13:54 +0000 (06:13 +0200)]
lavf: factor ff_free_stream() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: fix min DTS code, try #2
Michael Niedermayer [Mon, 20 Aug 2012 23:48:04 +0000 (01:48 +0200)]
hls: fix min DTS code, try #2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: fix EOF check
Michael Niedermayer [Mon, 20 Aug 2012 23:47:29 +0000 (01:47 +0200)]
hls: fix EOF check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/showspectrum: add priv_class and flags to options
Stefano Sabatini [Mon, 20 Aug 2012 23:03:36 +0000 (01:03 +0200)]
lavfi/showspectrum: add priv_class and flags to options

6 years agohls: use av_compare_ts() instead of comparing apples to oranges.
Michael Niedermayer [Mon, 20 Aug 2012 23:00:05 +0000 (01:00 +0200)]
hls: use av_compare_ts() instead of comparing apples to oranges.

Fixes Ticket983

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/asyncts: Fix compilation with GCC 4.7
Thomas Weber [Mon, 20 Aug 2012 20:54:03 +0000 (22:54 +0200)]
lavfi/asyncts: Fix compilation with GCC 4.7

Compilation failed since commit 42d621d131a45fb63571ca6029c2fc4f02811c10
Error messages:
libavfilter/af_asyncts.c:249:5: error: initializer element is not
computable at load time
libavfilter/af_asyncts.c:249:5: error: (near initialization for
‘avfilter_af_asyncts.priv_size’)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: remove outdated warning.
Nicolas George [Sun, 19 Aug 2012 10:14:29 +0000 (12:14 +0200)]
ffmpeg: remove outdated warning.

-t works with complex filters now.

6 years agolavf/nutenc: write stream metadata.
Nicolas George [Sat, 18 Aug 2012 22:30:30 +0000 (00:30 +0200)]
lavf/nutenc: write stream metadata.

6 years agolavf/nut: define fourcc DVBT for DVB_TELETEXT.
Nicolas George [Sat, 18 Aug 2012 21:52:55 +0000 (23:52 +0200)]
lavf/nut: define fourcc DVBT for DVB_TELETEXT.

Allow "-map 0:s -c:s copy" to copy all subtitles streams.

6 years agoffmpeg: remove useless flags to EOF av_buffersrc_add_ref.
Nicolas George [Sun, 19 Aug 2012 17:02:31 +0000 (19:02 +0200)]
ffmpeg: remove useless flags to EOF av_buffersrc_add_ref.

6 years agolavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH.
Nicolas George [Sun, 19 Aug 2012 16:08:24 +0000 (18:08 +0200)]
lavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH.

6 years agolavfi/edgedetect: use "@see" instead of the invalid "@url".
Clément Bœsch [Mon, 20 Aug 2012 21:12:34 +0000 (23:12 +0200)]
lavfi/edgedetect: use "@see" instead of the invalid "@url".

6 years agolavfi: add showspectrum filter.
Clément Bœsch [Thu, 29 Dec 2011 22:45:45 +0000 (23:45 +0100)]
lavfi: add showspectrum filter.

6 years agoh264: fix variable overflow after a few years of video playback
Michael Niedermayer [Mon, 20 Aug 2012 20:30:00 +0000 (22:30 +0200)]
h264: fix variable overflow after a few years of video playback

Found-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofix spelling
rogerdpack [Sun, 19 Aug 2012 14:58:49 +0000 (08:58 -0600)]
fix spelling

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow:protect access to curbufsize to promote consistency
rogerdpack [Sun, 19 Aug 2012 14:10:07 +0000 (08:10 -0600)]
dshow:protect access to curbufsize to promote consistency

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: avoid integer overflow when using curbufsize
rogerdpack [Sun, 19 Aug 2012 12:52:03 +0000 (06:52 -0600)]
dshow: avoid integer overflow when using curbufsize

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: Port to ff_alloc_packet2
Derek Buitenhuis [Mon, 20 Aug 2012 18:07:41 +0000 (14:07 -0400)]
utvideoenc: Port to ff_alloc_packet2

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix utvideoenc tests
Mans Rullgard [Mon, 20 Aug 2012 13:58:02 +0000 (14:58 +0100)]
fate: fix utvideoenc tests

For some reason, the prerequisites have to be specified like this.
Make works in mysterious ways.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agorename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT
XhmikosR [Sun, 19 Aug 2012 17:19:19 +0000 (13:19 -0400)]
rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 20 Aug 2012 15:15:15 +0000 (17:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Add FATE tests for the Ut Video encoder
  lavc: add Ut Video encoder
  mpegvideo_enc: remove stray duplicate line from 7f9aaa4
  swscale: x86: fix #endif comments in rgb2rgb template file
  avconv: mark more options as expert.
  avconv: split printing "main options" into global and per-file.
  avconv: refactor help printing.

Conflicts:
Changelog
ffmpeg_opt.c
ffserver.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'
Michael Niedermayer [Mon, 20 Aug 2012 15:03:04 +0000 (17:03 +0200)]
Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
  avconv: print info/capabilities options in a separate help group.
  avtools: add -h demuxer/muxer
  cmdutils: extend -h to allow printing codec details.

Conflicts:
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'
Michael Niedermayer [Mon, 20 Aug 2012 14:52:42 +0000 (16:52 +0200)]
Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'

* commit '7c5012127fb7e18f0616011257bb4248f6a8b608':
  cmdutils: change semantics of show_help_options() and document it.
  avtools: move some newlines to show_help_options().
  avconv: deprecate -isync.

Conflicts:
ffmpeg_opt.c
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'
Michael Niedermayer [Mon, 20 Aug 2012 14:44:05 +0000 (16:44 +0200)]
Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'

* commit '8fc83fb081963001e1197c6fdd59fd2af415078a':
  avconv: reformat the options table.

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: amrwb: Drop redundant lsp dependency declaration
Diego Biurrun [Mon, 13 Aug 2012 23:51:15 +0000 (01:51 +0200)]
build: amrwb: Drop redundant lsp dependency declaration

6 years agofate: fix utvideoenc tests
Mans Rullgard [Mon, 20 Aug 2012 13:58:02 +0000 (14:58 +0100)]
fate: fix utvideoenc tests

For some reason, the prerequisites have to be specified like this.
Make works in mysterious ways.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoffmpeg_opt: get rid of casts for the HAS_ARG case
Michael Niedermayer [Mon, 20 Aug 2012 14:05:59 +0000 (16:05 +0200)]
ffmpeg_opt: get rid of casts for the HAS_ARG case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: remove casts for OPT_FUNC2
Michael Niedermayer [Mon, 20 Aug 2012 14:04:10 +0000 (16:04 +0200)]
ffmpeg_opt: remove casts for OPT_FUNC2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: fix copy_tb
Michael Niedermayer [Mon, 20 Aug 2012 14:02:03 +0000 (16:02 +0200)]
ffmpeg_opt: fix copy_tb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'
Michael Niedermayer [Mon, 20 Aug 2012 13:48:21 +0000 (15:48 +0200)]
Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'

* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
  avconv: get rid of ugly casts in the options table.
  avconv: try to match codecs by codec descriptor name as a last resort.
  avtools: fix show_foo() signatures.

Conflicts:
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
ffmpeg_opt.c
ffplay.c
ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix duplicate packet init introduced by 7f9aaa4
Wolfram Gloger [Mon, 20 Aug 2012 11:17:35 +0000 (13:17 +0200)]
Fix duplicate packet init introduced by 7f9aaa4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Add FATE tests for the Ut Video encoder
Jan Ekström [Sun, 19 Aug 2012 17:07:13 +0000 (20:07 +0300)]
fate: Add FATE tests for the Ut Video encoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavc: add Ut Video encoder
Jan Ekström [Mon, 20 Aug 2012 09:15:34 +0000 (12:15 +0300)]
lavc: add Ut Video encoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agompegvideo_enc: remove stray duplicate line from 7f9aaa4
Anton Khirnov [Sun, 19 Aug 2012 17:28:52 +0000 (19:28 +0200)]
mpegvideo_enc: remove stray duplicate line from 7f9aaa4

6 years agoh264: Workaround invalid MPEG-TS broadcasts
Michael Niedermayer [Mon, 20 Aug 2012 03:36:52 +0000 (05:36 +0200)]
h264: Workaround invalid MPEG-TS broadcasts

Fixes seeking to the first keyframe
Fixes Ticket1029

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavrndec: add DR1 capability flag
Michael Niedermayer [Mon, 20 Aug 2012 01:31:41 +0000 (03:31 +0200)]
avrndec: add DR1 capability flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAVRn: fix progressive
Michael Niedermayer [Mon, 20 Aug 2012 00:50:59 +0000 (02:50 +0200)]
AVRn: fix progressive

Fixes Ticket970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: move AVRn to a seperate decoder.
Michael Niedermayer [Mon, 20 Aug 2012 00:19:37 +0000 (02:19 +0200)]
lavc: move AVRn to a seperate decoder.

The special cases in demuxers and decoders are a mess otherwise (and more
would be needed to support it fully)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: x86: fix #endif comments in rgb2rgb template file
Giorgio Vazzana [Thu, 16 Aug 2012 12:35:41 +0000 (14:35 +0200)]
swscale: x86: fix #endif comments in rgb2rgb template file

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavconv: mark more options as expert.
Anton Khirnov [Wed, 15 Aug 2012 08:33:36 +0000 (10:33 +0200)]
avconv: mark more options as expert.

6 years agoavconv: split printing "main options" into global and per-file.
Anton Khirnov [Wed, 15 Aug 2012 08:31:46 +0000 (10:31 +0200)]
avconv: split printing "main options" into global and per-file.

6 years agoavconv: refactor help printing.
Anton Khirnov [Tue, 14 Aug 2012 06:56:32 +0000 (08:56 +0200)]
avconv: refactor help printing.

By default don't dump every single option on the user, but print only
the basic options.

Add -h long/full to print more options.

6 years agoavconv: print info/capabilities options in a separate help group.
Anton Khirnov [Tue, 14 Aug 2012 06:21:42 +0000 (08:21 +0200)]
avconv: print info/capabilities options in a separate help group.

6 years agoavtools: add -h demuxer/muxer
Anton Khirnov [Tue, 14 Aug 2012 05:57:56 +0000 (07:57 +0200)]
avtools: add -h demuxer/muxer

6 years agocmdutils: extend -h to allow printing codec details.
Anton Khirnov [Mon, 13 Aug 2012 18:06:25 +0000 (20:06 +0200)]
cmdutils: extend -h to allow printing codec details.

6 years agocmdutils: change semantics of show_help_options() and document it.
Anton Khirnov [Sat, 11 Aug 2012 17:45:30 +0000 (19:45 +0200)]
cmdutils: change semantics of show_help_options() and document it.

Currently it takes a mask and value, such that options for which
(flags & mask) == value.

Change it to take required flags and forbidden flags instead. This is
shorter and simpler to understand.

6 years agoavtools: move some newlines to show_help_options().
Anton Khirnov [Sat, 11 Aug 2012 17:33:27 +0000 (19:33 +0200)]
avtools: move some newlines to show_help_options().

Don't require every caller to supply them.

6 years agoavconv: deprecate -isync.
Anton Khirnov [Sat, 11 Aug 2012 17:19:53 +0000 (19:19 +0200)]
avconv: deprecate -isync.

This option does not do anything.

Also remove OPT_GRAB, since -isync is the last option using it.

6 years agoavconv: reformat the options table.
Anton Khirnov [Sat, 11 Aug 2012 15:00:30 +0000 (17:00 +0200)]
avconv: reformat the options table.

6 years agoavconv: get rid of ugly casts in the options table.
Anton Khirnov [Sat, 11 Aug 2012 14:30:26 +0000 (16:30 +0200)]
avconv: get rid of ugly casts in the options table.

6 years agoavconv: try to match codecs by codec descriptor name as a last resort.
Anton Khirnov [Sat, 11 Aug 2012 13:40:12 +0000 (15:40 +0200)]
avconv: try to match codecs by codec descriptor name as a last resort.

This allows e.g. -c:v h264 to select the libx264 encoder.

6 years agoavtools: fix show_foo() signatures.
Anton Khirnov [Sat, 11 Aug 2012 14:13:54 +0000 (16:13 +0200)]
avtools: fix show_foo() signatures.

show_foo() functions are declared as void show_foo(void), but called as
int show_foo(const char*, const char*).

6 years agodshow: protect access to curbufsize
rogerdpack [Thu, 16 Aug 2012 16:43:40 +0000 (10:43 -0600)]
dshow: protect access to curbufsize

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: cleanup reference
rogerdpack [Thu, 16 Aug 2012 16:42:46 +0000 (10:42 -0600)]
dshow: cleanup reference

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: avcodec_get_name: return "none" for AV_CODEC_ID_NONE.
Nicolas George [Sun, 19 Aug 2012 13:26:05 +0000 (15:26 +0200)]
lavc: avcodec_get_name: return "none" for AV_CODEC_ID_NONE.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 19 Aug 2012 12:55:58 +0000 (14:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vorbisdec: remove some pointless comments
  avprobe: add const to AVCodec pointer
  libavformat: add const to AVCodec pointers
  pthread: add const to AVCodec pointers

Conflicts:
ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbisdec: remove some pointless comments
Mans Rullgard [Sat, 18 Aug 2012 13:30:11 +0000 (14:30 +0100)]
vorbisdec: remove some pointless comments

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavfi: add volumedetect filter.
Nicolas George [Sat, 18 Aug 2012 11:49:47 +0000 (13:49 +0200)]
lavfi: add volumedetect filter.

6 years agoffmpeg: reindent after last commit.
Nicolas George [Sun, 19 Aug 2012 09:23:59 +0000 (11:23 +0200)]
ffmpeg: reindent after last commit.

6 years agoffmpeg: reduce differences with avconv for in/out scheduling.
Nicolas George [Fri, 17 Aug 2012 11:50:16 +0000 (13:50 +0200)]
ffmpeg: reduce differences with avconv for in/out scheduling.

Rework the transcode() function and its immediate annexes to have
the same structure as in avconv, while still maintaining proper
scheduling to avoid accumulation.

Using -filter_complex without inputs now works.

6 years agoffmpeg: Clip invalid video timestamps like audio instead of failing hard.
Michael Niedermayer [Sun, 19 Aug 2012 00:42:53 +0000 (02:42 +0200)]
ffmpeg: Clip invalid video timestamps like audio instead of failing hard.

Fixes Ticket976

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorawdec: support AVRn 1:1 raw interlaced mode
Michael Niedermayer [Sat, 18 Aug 2012 02:03:03 +0000 (04:03 +0200)]
rawdec: support AVRn 1:1 raw interlaced mode

Fixes Ticket971

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: fix computation of M3U8 segment target duration
Stefano Sabatini [Sat, 18 Aug 2012 20:27:49 +0000 (22:27 +0200)]
lavf/segment: fix computation of M3U8 segment target duration

Use ceil on the max duration, rather than approximating it to the nearest
integer.

6 years agoelbg: switch to av_assert
Michael Niedermayer [Sat, 18 Aug 2012 19:54:52 +0000 (21:54 +0200)]
elbg: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoelbg: fix assert
Michael Niedermayer [Sat, 18 Aug 2012 19:53:32 +0000 (21:53 +0200)]
elbg: fix assert

It seems the condition was flipped from what was intended

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: add use_wallclock_as_timestamps
Michael Niedermayer [Thu, 16 Aug 2012 22:08:51 +0000 (00:08 +0200)]
lavf: add use_wallclock_as_timestamps

This may fix Ticket730

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/au: check bits per coded sample.
Nicolas George [Sat, 18 Aug 2012 12:12:41 +0000 (14:12 +0200)]
lavf/au: check bits per coded sample.

Without that, it would repeatedly produce empty packets
if the codec if forced to something invalid.

Fix trac ticket #1652.

6 years agobuildsys: fix cleaning of libmpcodecs
Michael Niedermayer [Sat, 18 Aug 2012 14:36:16 +0000 (16:36 +0200)]
buildsys: fix cleaning of libmpcodecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: vdpau: fix crash with unsupported colorspace
Uoti Urpala [Sat, 18 Aug 2012 14:11:45 +0000 (16:11 +0200)]
h264: vdpau: fix crash with unsupported colorspace

The h264_vdpau decoder crashed if output colorspace was not 8-bit 420.
Add a check to error out instead (current hardware does not support
other colorspaces, so successful decoding is not possible).

Check implemented at a different place by michael, thus blame for bugs goes to michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavprobe: add const to AVCodec pointer
Mans Rullgard [Sat, 18 Aug 2012 12:22:57 +0000 (13:22 +0100)]
avprobe: add const to AVCodec pointer

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolibavformat: add const to AVCodec pointers
Mans Rullgard [Sat, 18 Aug 2012 12:22:38 +0000 (13:22 +0100)]
libavformat: add const to AVCodec pointers

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agopthread: add const to AVCodec pointers
Mans Rullgard [Sat, 18 Aug 2012 12:20:09 +0000 (13:20 +0100)]
pthread: add const to AVCodec pointers

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 18 Aug 2012 13:10:13 +0000 (15:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: don't use deprecated avcodec_encode_video().
  cmdutils: refactor -codecs option.
  avconv: make -shortest a per-output file option.
  lavc: add avcodec_descriptor_get_by_name().
  lavc: add const to AVCodec* function parameters.
  swf(dec): replace CODEC_ID with AV_CODEC_ID
  dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
  rtmpdh: Do not generate the same private key every time when using libnettle
  rtp: remove ff_rtp_get_rtcp_file_handle().
  rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
  avio: add (ff)url_get_multi_file_handle() for getting more than one fd
  h264: vdpau: fix crash with unsupported colorspace
  amrwbdec: Decode the fr_quality bit properly

Conflicts:
Changelog
cmdutils.c
cmdutils_common_opts.h
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
libavcodec/h264.c
libavcodec/options.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/muxers: simplify segment examples
Stefano Sabatini [Wed, 15 Aug 2012 22:23:17 +0000 (00:23 +0200)]
doc/muxers: simplify segment examples

The simplifications are due to the recent option changes.

6 years agolavf/segment: change default value for segment_list_size option, from 5 to 0
Stefano Sabatini [Wed, 15 Aug 2012 22:20:48 +0000 (00:20 +0200)]
lavf/segment: change default value for segment_list_size option, from 5 to 0

This is technically a major compatibility break, but seems the most
natural default and what users would expect without reading the docs.

6 years agolavf/segment: guess list type from list filename suffix
Stefano Sabatini [Wed, 15 Aug 2012 22:16:28 +0000 (00:16 +0200)]
lavf/segment: guess list type from list filename suffix

6 years agolavfi/mp: remove framestep wrapped filter
Stefano Sabatini [Thu, 16 Aug 2012 17:06:00 +0000 (19:06 +0200)]
lavfi/mp: remove framestep wrapped filter

An equivalent framestep filter has been natively integrated.

6 years agolavfi: add framestep filter
Stefano Sabatini [Thu, 16 Aug 2012 17:04:26 +0000 (19:04 +0200)]
lavfi: add framestep filter

This filter is inspired upon libmpcodecs/vf_framestep.c, by Daniele
Forghieri.

Only-keyframe output is not supported, since that feature can be achieved
through the more versatile select filter.

6 years agolavfi/testsrc: set output framerate
Stefano Sabatini [Thu, 16 Aug 2012 19:53:30 +0000 (21:53 +0200)]
lavfi/testsrc: set output framerate

6 years agolavf/segment: add M3U8 list support
Stefano Sabatini [Wed, 15 Aug 2012 09:06:34 +0000 (11:06 +0200)]
lavf/segment: add M3U8 list support

Address trac ticket #1642.

6 years agolavf/segment: compute max list segment duration
Stefano Sabatini [Wed, 15 Aug 2012 21:14:34 +0000 (23:14 +0200)]
lavf/segment: compute max list segment duration

This is useful for the M3U8 format incoming patch.

6 years agolavf/segment: create segment_list_open and close functions
Stefano Sabatini [Wed, 15 Aug 2012 21:21:41 +0000 (23:21 +0200)]
lavf/segment: create segment_list_open and close functions

Allow factorization for the incoming patches, and avoid code/logic
duplication.

6 years agolavf/segment: fix bogus segment index rewrapping logic
Stefano Sabatini [Wed, 15 Aug 2012 20:12:11 +0000 (22:12 +0200)]
lavf/segment: fix bogus segment index rewrapping logic

Decouple segment index wrapping and segment count logic. The counter
should not be reset since it detects the segment increasing timeframe.