ffmpeg.git
9 years agocmdutils: fix uninitialized variable (type) warning.
Clément Bœsch [Thu, 1 Sep 2011 00:56:59 +0000 (02:56 +0200)]
cmdutils: fix uninitialized variable (type) warning.

9 years agosws: fix a huge amount of incompatible pointer type arguments warnings.
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.

9 years agoffmpeg: fix two unused variables warnings.
Clément Bœsch [Thu, 1 Sep 2011 00:27:38 +0000 (02:27 +0200)]
ffmpeg: fix two unused variables warnings.

9 years agoresample: fix set but unused variable (lfe) warning.
Clément Bœsch [Thu, 1 Sep 2011 00:15:39 +0000 (02:15 +0200)]
resample: fix set but unused variable (lfe) warning.

9 years agoimgconvert: avoid mixed declarations and code.
Clément Bœsch [Thu, 1 Sep 2011 00:01:54 +0000 (02:01 +0200)]
imgconvert: avoid mixed declarations and code.

9 years agoFix compilation with --disable-avfilter.
Carl Eugen Hoyos [Thu, 1 Sep 2011 17:03:39 +0000 (19:03 +0200)]
Fix compilation with --disable-avfilter.

Fixes ticket #425.

9 years agojpegdec: set color_range
Gavin Kinsey [Thu, 1 Sep 2011 14:18:22 +0000 (16:18 +0200)]
jpegdec: set color_range

9 years agoffmpeg: Fix typos introduced in:
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>
9 years agovc1: loose one line difference to qatar.
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>
9 years agompeg4: fix typo in mpeg4_encode_gop_header()
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>
9 years agoReplace some commented-out debug printf() / av_log() messages with av_dlog().
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>
9 years agoAPIchanges: remove "deprecate url_feof"
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>
9 years agoMerge remote-tracking branch 'qatar/master'
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>
9 years agolibx264: set default thread count to 0 (auto)
Anton Khirnov [Wed, 31 Aug 2011 12:04:02 +0000 (14:04 +0200)]
libx264: set default thread count to 0 (auto)

9 years agovsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref()
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()

9 years agolavdev/lavfi: add debug traces in lavfi_read_packet()
Stefano Sabatini [Mon, 29 Aug 2011 16:41:50 +0000 (18:41 +0200)]
lavdev/lavfi: add debug traces in lavfi_read_packet()

9 years agovf_yadif: add support to yuva420p
Stefano Sabatini [Sat, 27 Aug 2011 16:32:14 +0000 (18:32 +0200)]
vf_yadif: add support to yuva420p

9 years agolavc: cosmetics, group deprecated codec flags
Anton Khirnov [Sat, 27 Aug 2011 11:33:10 +0000 (13:33 +0200)]
lavc: cosmetics, group deprecated codec flags

9 years agompeg12: add 'scan_offset' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mpeg12: add 'scan_offset' private option.

Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET

9 years agoh263/p encoder: add 'structured_slices' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263/p encoder: add 'structured_slices' private option.

Deprecate CODEC_FLAG_H263P_SLICE_STRUCT

9 years agoh263/p encoder: add 'obmc' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263/p encoder: add 'obmc' private option.

Deprecate CODEC_FLAG_OBMC

9 years agoh263p encoder: add 'aiv' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263p encoder: add 'aiv' private option.

Deprecate CODEC_FLAG_H263P_AIV

9 years agoh263p encoder: add 'umv' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263p encoder: add 'umv' private option.

Deprecate CODEC_FLAG_H263P_UMV

9 years agompeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.

Deprecate CODEC_FLAG_ALT_SCAN

9 years agomjpegdec: add 'extern_huff' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mjpegdec: add 'extern_huff' private option.

Deprecate CODEC_FLAG_EXTERN_HUFF

9 years agompeg4enc: add 'data_partitioning' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mpeg4enc: add 'data_partitioning' private option.

Deprecate CODEC_FLAG_PART

9 years agosnow: add 'memc_only' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
snow: add 'memc_only' private option.

Deprecate CODEC_FLAG2_MEMC_ONLY

9 years agolibx264: add 'mbtree' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
libx264: add 'mbtree' private option.

Deprecate CODEC_FLAG2_MBTREE

9 years agolibx264: add 'psy' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
libx264: add 'psy' private option.

Deprecate CODEC_FLAG2_PSY

9 years agolibmp3lame: add 'reservoir' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:09:09 +0000 (10:09 +0200)]
libmp3lame: add 'reservoir' private option.

Deprecate CODEC_FLAG2_BIT_RESERVOIR

9 years agompeg2enc: add 'non_linear_quant' private option
Anton Khirnov [Sat, 27 Aug 2011 07:57:36 +0000 (09:57 +0200)]
mpeg2enc: add 'non_linear_quant' private option

Deprecate CODEC_FLAG2_NON_LINEAR_QUANT

9 years agompeg12enc: add drop_frame_timecode private option.
Anton Khirnov [Sat, 27 Aug 2011 06:34:05 +0000 (08:34 +0200)]
mpeg12enc: add drop_frame_timecode private option.

Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE

9 years agompeg12enc: add intra_vlc private option.
Anton Khirnov [Sat, 27 Aug 2011 06:26:14 +0000 (08:26 +0200)]
mpeg12enc: add intra_vlc private option.

Deprecate CODEC_FLAG2_INTRA_VLC.

9 years agoVC1: Support dynamic dimension changes
Alberto Delmás [Sat, 27 Aug 2011 17:37:26 +0000 (19:37 +0200)]
VC1: Support dynamic dimension changes

Fixes SA00072, SA00073, SA10150, SA10151, Issue2076

Improves SA10153

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agomjpeg: treat external huffman table setup failure as codec init failure if external...
Dustin Brody [Thu, 25 Aug 2011 23:47:01 +0000 (19:47 -0400)]
mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavc: deprecate CODEC_FLAG2_BRDO
Anton Khirnov [Wed, 24 Aug 2011 14:26:15 +0000 (16:26 +0200)]
lavc: deprecate CODEC_FLAG2_BRDO

It's been unused for the last 3 years.

9 years agolibx264: add 'aud' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'aud' private option.

Deprecate CODEC_FLAG2_AUD.

9 years agolibx264: add 'fast-pskip' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'fast-pskip' private option.

Deprecate CODEC_FLAG2_FASTPSKIP.

9 years agolibx264: add '8x8dct' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add '8x8dct' private option.

Deprecate CODEC_FLAG2_8X8DCT.

9 years agolibx264: add 'mixed-refs' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'mixed-refs' private option.

Deprecate CODEC_FLAG2_MIXED_REFS.

9 years agolibx264: add 'weightb' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'weightb' private option.

Deprecate CODEC_FLAG2_BPYRAMID.

9 years agolibx264: add 'b-pyramid' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'b-pyramid' private option.

Deprecate CODEC_FLAG2_BPYRAMID.

9 years agolibx264: add 'intra-refresh' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'intra-refresh' private option.

Deprecate CODEC_FLAG2_INTRA_REFRESH.

9 years agolibx264: add 'ssim' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'ssim' private option.

Deprecate CODEC_FLAG2_SSIM.

9 years agolibx264: make options compatible with x264
Anton Khirnov [Sat, 27 Aug 2011 05:52:03 +0000 (07:52 +0200)]
libx264: make options compatible with x264

Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd

9 years agoavcodec: remove misleading comment
Luca Barbato [Mon, 29 Aug 2011 20:47:06 +0000 (22:47 +0200)]
avcodec: remove misleading comment

coded_width is the width before lowres scaling,
coded_height is the height before lowres scaling.

9 years agoh264: clean all non null elements of delayed_pic[]
Michael Niedermayer [Wed, 31 Aug 2011 03:04:14 +0000 (05:04 +0200)]
h264: clean all non null elements of delayed_pic[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: change MAX_DELAYED_PIC_COUNT check to av_assert0
Michael Niedermayer [Wed, 31 Aug 2011 03:00:39 +0000 (05:00 +0200)]
h264: change MAX_DELAYED_PIC_COUNT check to av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'f593628e5868e52a46de666767896c6afcebdae4'
Michael Niedermayer [Tue, 30 Aug 2011 22:03:59 +0000 (00:03 +0200)]
Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'

* commit 'f593628e5868e52a46de666767896c6afcebdae4':
  avconv: Replace raw picture frame swapping hack.
  RV40: reuse some H.264 motion compensation functions in RV40.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport speex in avi.
Carl Eugen Hoyos [Tue, 30 Aug 2011 21:13:23 +0000 (23:13 +0200)]
Support speex in avi.

9 years agovf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0
Michael Niedermayer [Tue, 30 Aug 2011 21:37:49 +0000 (23:37 +0200)]
vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0
the basetime argument also enables useage of pts instead of time()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter/graphparser: Avoid spaces in filter instance names.
Michael Niedermayer [Tue, 30 Aug 2011 20:02:38 +0000 (22:02 +0200)]
libavfilter/graphparser: Avoid spaces in filter instance names.
This makes it easier to refer to filters where things are seperated by spaces.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: ffmpeg: fix reading commands from the keyboard
Michael Niedermayer [Tue, 30 Aug 2011 19:56:40 +0000 (21:56 +0200)]
ffmpeg: ffmpeg: fix reading commands from the keyboard

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: remove -threads option.
Anton Khirnov [Mon, 29 Aug 2011 10:53:08 +0000 (12:53 +0200)]
avconv: remove -threads option.

It's only shadowing the AVOption with the same name.

9 years agoffmpeg: fix reading commands from stdin
Michael Niedermayer [Tue, 30 Aug 2011 18:17:07 +0000 (20:17 +0200)]
ffmpeg: fix reading commands from stdin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_drawtext: fix segfault on reinit
Michael Niedermayer [Tue, 30 Aug 2011 17:47:23 +0000 (19:47 +0200)]
vf_drawtext: fix segfault on reinit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: Replace raw picture frame swapping hack.
Alex Converse [Tue, 30 Aug 2011 02:28:42 +0000 (19:28 -0700)]
avconv: Replace raw picture frame swapping hack.

9 years agofate: Switch default tool to test from avconv to ffmpeg
Michael Niedermayer [Tue, 30 Aug 2011 16:16:03 +0000 (18:16 +0200)]
fate: Switch default tool to test from avconv to ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: re-add nb_streams to InputFile.
Anton Khirnov [Tue, 30 Aug 2011 14:43:11 +0000 (16:43 +0200)]
ffmpeg: re-add nb_streams to InputFile.

It was mistakenly removed in 2cf8355f98681bdd726b739008acd5483f82f8d7,
not taking into account that new streams might appear in av_read_frame()
that avconv doesn't know about.

Fixes bug 24.

9 years agoffmpeg: Replace goto redo on decode fail with continue.
Alex Converse [Tue, 30 Aug 2011 14:39:05 +0000 (16:39 +0200)]
ffmpeg: Replace goto redo on decode fail with continue.

This checks for sigterm but otherwise is identical to the previous
behavior.

9 years agoffmpeg: Remove dead store.
Alex Converse [Tue, 30 Aug 2011 14:38:38 +0000 (16:38 +0200)]
ffmpeg: Remove dead store.

9 years agoffmpeg: use av_clip_int16 for audio clipping
Alex Converse [Tue, 30 Aug 2011 14:38:09 +0000 (16:38 +0200)]
ffmpeg: use av_clip_int16 for audio clipping

9 years agoffmpeg: switch stream mapping print code to qatars variant
Michael Niedermayer [Tue, 30 Aug 2011 14:33:20 +0000 (16:33 +0200)]
ffmpeg: switch stream mapping print code to qatars variant

Author of the lines of code is probably Nicolas and or Anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: move the avcodec_find_decoder() call to add_input_streams().
Anton Khirnov [Tue, 30 Aug 2011 14:25:18 +0000 (16:25 +0200)]
ffmpeg: move the avcodec_find_decoder() call to add_input_streams().

This makes the code simpler to understand, though it results in an
unnecessary call to avcodec_find_decoder() if the stream won't be
decoded.

9 years agoffmpeg: Separate initialization from the main transcode loop.
Alex Converse [Tue, 30 Aug 2011 14:03:51 +0000 (16:03 +0200)]
ffmpeg: Separate initialization from the main transcode loop.

9 years agoffmpeg: reset input_ts_offset between files.
Anton Khirnov [Tue, 30 Aug 2011 14:01:20 +0000 (16:01 +0200)]
ffmpeg: reset input_ts_offset between files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: call flush_encoders() from transcode() directly.
Anton Khirnov [Tue, 30 Aug 2011 14:00:47 +0000 (16:00 +0200)]
ffmpeg: call flush_encoders() from transcode() directly.

And remove now pointless parameter.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix broken indentation.
Anton Khirnov [Tue, 30 Aug 2011 13:59:56 +0000 (15:59 +0200)]
ffmpeg: fix broken indentation.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: rescue poor abused limit_filesize global.
Anton Khirnov [Tue, 30 Aug 2011 13:58:26 +0000 (15:58 +0200)]
ffmpeg: rescue poor abused limit_filesize global.

Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
9 years agoffmpeg: Set error code before before jumping to fail.
Alex Converse [Tue, 30 Aug 2011 13:57:50 +0000 (15:57 +0200)]
ffmpeg: Set error code before before jumping to fail.

9 years agoffmpeg: Fix spelling errors.
Alex Converse [Tue, 30 Aug 2011 13:57:16 +0000 (15:57 +0200)]
ffmpeg: Fix spelling errors.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoffmpeg: save two levels of indentation in flush_encoders()
Anton Khirnov [Tue, 30 Aug 2011 13:56:03 +0000 (15:56 +0200)]
ffmpeg: save two levels of indentation in flush_encoders()

By replacing
if (foo)
    <do stuff>

with
if (!foo)
    continue;
<do stuff>

9 years agoffmpeg: factor flushing encoders out of output_packet().
Anton Khirnov [Tue, 30 Aug 2011 13:55:25 +0000 (15:55 +0200)]
ffmpeg: factor flushing encoders out of output_packet().

9 years agoffmpeg: factor out initializing input streams.
Anton Khirnov [Tue, 30 Aug 2011 13:53:55 +0000 (15:53 +0200)]
ffmpeg: factor out initializing input streams.

9 years agoffmpeg: reset streamid_map between output files.
Anton Khirnov [Tue, 30 Aug 2011 13:46:55 +0000 (15:46 +0200)]
ffmpeg: reset streamid_map between output files.

9 years agoffmpeg: make timer_start a local var in transcode().
Anton Khirnov [Tue, 30 Aug 2011 13:46:24 +0000 (15:46 +0200)]
ffmpeg: make timer_start a local var in transcode().

9 years agoffmpeg: cosmetics, move OutputStream.
Anton Khirnov [Tue, 30 Aug 2011 13:44:47 +0000 (15:44 +0200)]
ffmpeg: cosmetics, move OutputStream.

Allows us to get rid of forward InputStream declaration.

9 years agoffmpeg: remove two unused macros.
Anton Khirnov [Tue, 30 Aug 2011 13:42:42 +0000 (15:42 +0200)]
ffmpeg: remove two unused macros.

9 years agoffmpeg: reindent.
Anton Khirnov [Tue, 30 Aug 2011 13:42:10 +0000 (15:42 +0200)]
ffmpeg: reindent.

9 years agoffmpeg: rescue poor abused start_time global.
Anton Khirnov [Tue, 30 Aug 2011 13:32:12 +0000 (15:32 +0200)]
ffmpeg: rescue poor abused start_time global.

Keep a per-OutputFile instance of it, thus making -ss work with multiple
output files.

9 years agoffmpeg: : rescue poor abused recording_time global.
Anton Khirnov [Tue, 30 Aug 2011 13:23:51 +0000 (15:23 +0200)]
ffmpeg: : rescue poor abused recording_time global.

Keep a per-OutputFile instance of it, thus making -t work with multiple
output files.

9 years agoffmpeg: fix broken indentation.
Anton Khirnov [Tue, 30 Aug 2011 13:08:39 +0000 (15:08 +0200)]
ffmpeg: fix broken indentation.

9 years agoffmpeg: get rid of the arbitrary MAX_FILES limit.
Anton Khirnov [Tue, 30 Aug 2011 13:08:02 +0000 (15:08 +0200)]
ffmpeg: get rid of the arbitrary MAX_FILES limit.

9 years agoffmpeg: get rid of the output_streams_for_file vs. ost_table schizophrenia
Anton Khirnov [Tue, 30 Aug 2011 13:03:53 +0000 (15:03 +0200)]
ffmpeg: get rid of the output_streams_for_file vs. ost_table schizophrenia

Instead store output streams in the same way as input streams.

9 years agoRevert "Fix stream mapping regression"
Michael Niedermayer [Tue, 30 Aug 2011 12:57:54 +0000 (14:57 +0200)]
Revert "Fix stream mapping regression"

Subsequent cherry picks are based on code prior to this, thus this needs to be rebased
on HEAD by a volunteer.
This reverts commit b25d931a82c7b95b2f47e6759c9d9be7705d664b.

9 years agoffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into it
Anton Khirnov [Tue, 30 Aug 2011 12:19:39 +0000 (14:19 +0200)]
ffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into it

9 years agoffmpeg: make itsscale syntax consistent with other options.
Anton Khirnov [Tue, 30 Aug 2011 12:16:53 +0000 (14:16 +0200)]
ffmpeg: make itsscale syntax consistent with other options.

Move the stream specifier to the option name.

9 years agoffmpeg: factor out adding input streams.
Anton Khirnov [Tue, 30 Aug 2011 12:07:49 +0000 (14:07 +0200)]
ffmpeg: factor out adding input streams.

9 years agoffmpeg: Factorize combining auto vsync with format.
Alex Converse [Tue, 30 Aug 2011 11:42:27 +0000 (13:42 +0200)]
ffmpeg: Factorize combining auto vsync with format.

9 years agoffmpeg: Factorize video resampling.
Alex Converse [Tue, 30 Aug 2011 02:51:52 +0000 (04:51 +0200)]
ffmpeg: Factorize video resampling.

9 years agoffmpeg: Don't unnecessarily convert ipts to a double.
Alex Converse [Tue, 30 Aug 2011 02:45:46 +0000 (04:45 +0200)]
ffmpeg: Don't unnecessarily convert ipts to a double.

9 years agoffmpeg: don't segfault on 0 input files.
Anton Khirnov [Tue, 30 Aug 2011 02:22:06 +0000 (04:22 +0200)]
ffmpeg: don't segfault on 0 input files.

9 years agoffmpeg: remove pointless parameter from new_*_stream().
Anton Khirnov [Tue, 30 Aug 2011 02:20:25 +0000 (04:20 +0200)]
ffmpeg: remove pointless parameter from new_*_stream().

New streams are always added to the last output file.

9 years agoffmpeg: cosmetics, move code
Anton Khirnov [Tue, 30 Aug 2011 02:19:26 +0000 (04:19 +0200)]
ffmpeg: cosmetics, move code

Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.

9 years agoffmpeg: cosmetics -- move copy_chapters().
Anton Khirnov [Tue, 30 Aug 2011 02:15:30 +0000 (04:15 +0200)]
ffmpeg: cosmetics -- move copy_chapters().

It's only used in opt_output_file(), so move it right above
opt_output_file().

9 years agoffmpeg: cosmetics -- move parse_forced_key_frames().
Anton Khirnov [Tue, 30 Aug 2011 02:14:12 +0000 (04:14 +0200)]
ffmpeg: cosmetics -- move parse_forced_key_frames().

parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().

9 years agoffmpeg: switch to a:b syntax
Anton Khirnov [Tue, 30 Aug 2011 02:11:52 +0000 (04:11 +0200)]
ffmpeg: switch to a:b syntax

9 years agoffmpeg: replace -vcodec/-acodec/-scodec with a better system.
Anton Khirnov [Tue, 30 Aug 2011 02:10:54 +0000 (04:10 +0200)]
ffmpeg: replace -vcodec/-acodec/-scodec with a better system.

The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.

-[vas]codec remain as aliases to -codec:[vas]

9 years agoffmpeg: remove presets.
Anton Khirnov [Tue, 30 Aug 2011 02:29:51 +0000 (04:29 +0200)]
ffmpeg: remove presets.

Nothing except x264 uses them and native x264 presets should be used
with private options.

9 years agoRevert "ffmpeg: simplify opt_*_codec() options"
Michael Niedermayer [Tue, 30 Aug 2011 02:06:57 +0000 (04:06 +0200)]
Revert "ffmpeg: simplify opt_*_codec() options"
This is needed because the following cherry picks are based on code prior of this

This reverts commit f712f6c8a4bd14bae3c41118af642b5dae7f6e2b.