d64b854075
Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'
...
* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30':
atomic: Exclude the unsupported implementation headers from checkheaders
avconv: do not silently ignore unused codec AVOptions.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:34:24 +01:00
771919e11f
Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'
...
* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:06:30 +01:00
49e87819d0
Merge commit '1da54e908eba73eb86f5d614c51f06811c85c3ea'
...
* commit '1da54e908eba73eb86f5d614c51f06811c85c3ea':
avconv: use a local variable for OutputFile in open_output_file().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 20:58:56 +01:00
bd93f3c5bd
ffmpeg: fix reinit_filter type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 18:24:48 +01:00
5743095ca9
Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'
...
* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
avconv: print an error on applying options of the wrong type.
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
output-example: Update to use encode_video2 instead of the now dropped encode_video
Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 18:10:35 +01:00
cb2bd91413
ffmpeg: add the -canvas_size option.
...
Allows, amongst other things, to override the size guessed
by the sub2video hack.
Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.
2013-03-10 13:48:49 +01:00
e2427f04b7
ffmpeg_opt: Ask for overwrite in single image2 files too
...
Fixes Ticket1637
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 22:09:01 +01:00
2cffe38df3
Deprecate deinterlaced in libavcodec.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 21:11:48 +01:00
9af8179cdb
ffmpeg: fix -stats -v 0
...
Fixes Ticket1687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 19:38:13 +01:00
41401773d3
Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
...
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 12:57:17 +01:00
2d7044683f
ffmpeg_opt: add -to option to specify stop time
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-27 02:17:42 +01:00
af0e8144cd
ffmpeg_opt: cosmetics
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-25 18:36:21 +01:00
ad899522ff
ffmpeg: use a AVDictionary instead of the context to move swr parameters around
...
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 20:31:56 +01:00
6db37c9468
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
...
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
avconv: pass libavresample options to AVFilterGraph
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:41:31 +01:00
ccf9dd00da
ffmpeg: dont allow -flags to override -pass
...
Fixes Ticket2154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 01:26:26 +01:00
0cecaa9e2e
ffmpeg: free attachments, fix memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-03 03:09:23 +01:00
5a67e30b1c
ffmpeg: fix broken channel_layout option
...
Fixes ticket #2163 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01 22:54:18 +01:00
27db2bf000
ffmpeg: remove -crop* and -pad* options
...
The options have been deprecated and are non-operational since more than
two years.
2013-01-27 16:56:47 +01:00
fccd8c21c4
ffmpeg: add -guess_layout_max option.
2013-01-26 11:15:38 +01:00
c4738c3196
ffmpeg: fix typo in open_files() message
...
Found-By: Justin Ruggles
2013-01-25 00:46:41 +01:00
9aeffb3c2a
Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'
...
* commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d':
lavc: set the default rc_initial_buffer_occupancy
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-15 15:32:48 +01:00
89ef586867
doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases
2013-01-13 15:09:09 +01:00
a260c79733
ffmpeg: fix dither to 24bit PCM output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-08 20:28:15 +01:00
2a23f6035e
mpegpsenc: Fix SCR handling for DVD
...
This makes the initial SCR equal 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 20:58:59 +01:00
5bab99baea
ffmpeg: apply flags to attachments too.
2013-01-01 19:43:21 +01:00
951a03b3a8
ffmpeg: move stream_copy flags handling after attachments.
2013-01-01 19:43:20 +01:00
10a9277562
better filter error message when accidentally reusing outputs
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-01 19:39:10 +01:00
69a1667b06
ffmpeg: mark attachment streams finished.
...
Fix trac ticket #2083 .
2013-01-01 16:05:35 +01:00
13131685f1
ffmpeg: avoid negative timestamps for DVD
...
dvdauthor cannot handle files with ts wraps
Fixes ticket383
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-01 04:59:03 +01:00
103410d67e
ffmpeg_opt: fix recording time in->out carryover.
...
This should fix valgrind complaints.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 17:45:43 +01:00
40ea343866
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
...
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
cmdutils: pass number of groups to split_commandline().
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 12:06:15 +01:00
a46c565796
ffmpeg_opt: fix pointer types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 04:21:29 +01:00
1667152a9c
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
...
* commit 'acb571c89a065d943163c11efb46de35774f1909':
avcodec: bump minor for adaptive h264 frame-mt
avconv: pass the actually selected decoder to filter_codec_opts().
Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:44:22 +01:00
af4b1c02ac
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
...
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:38:02 +01:00
cb0881c794
ffmpeg: use GROW_ARRAY in opt_map_channel.
2012-12-19 22:57:35 +01:00
330983b728
Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'
...
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
cmdutils: add a macro to simplify grow_array() calls.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 22:04:03 +01:00
b684f744ac
ffmpeg: use avformat_seek_file() instead of av_seek_frame().
...
avformat_seek_file() is the new API. It will make sure the read_seek2()
callback is called when the demuxer has it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
2012-12-02 00:06:02 +01:00
b5e0e327ce
ffmpeg: fix swr filter_type for auto inserted aresample filters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 04:06:19 +01:00
bf2f93cdbf
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
...
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
x86: h264_chromamc: port to cpuflags
yop: fix typo
avconv: fix copying per-stream metadata.
doc: avtools-common-opts: Fix terminology concerning metric prefixes
configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
riff: Make ff_riff_tags static and move under appropriate #ifdef
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 00:43:45 +01:00
0efcf16a3e
replace av_log(0, by av_log(NULL,
...
The first parameter is a pointer and NULL is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 18:10:02 +01:00
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
a62242678f
ffmpeg: complain loudly and exit in case removed -sameq option is specified
...
This is better than silently ignoring the option, which results in
unexpected quality results.
2012-11-03 12:05:43 +01:00
7fd9d49ba7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
avconv_opt, cmdutils: Add missing function parameter Doxygen
x86: Move optimization suffix to end of function names
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 13:25:46 +01:00
a9d97e1b0a
ffmpeg: use av_rescale_delta() on the audio filter input
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 00:26:35 +02:00
af3fe43d84
Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'
...
* commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a':
lavu: postpone recent deprecations until the next major bump
APIchanges: update lavr bump date
avconv: only apply presets when we have an encoder.
atrac3: replace a calculation with FFALIGN()
atrac3: remove unused ATRAC3Context field, sample_rate
atrac3: use sizeof(variable) instead of sizeof(type)
atrac3: simplify MDCT window calculation
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 13:05:52 +02:00
fadfbb354b
Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
...
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
lavf: move RIFF INFO tag writing from avienc to riff
avconv: fix disabling auto mappings with -map_metadata
Conflicts:
ffmpeg_opt.c
libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 14:30:25 +02:00
3e0b29ccd0
ffmpeg: Make video filter graph reinit user selectable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 00:06:12 +02:00
b4ca1b159f
Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
...
* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
Remove libmpeg2 #define remnants
De-doxygenize some top-level files
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 15:01:39 +02:00
526cb36e4b
Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'
...
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 15:46:48 +02:00
e47ab0b2c9
ffmpeg_opt: dont fail for sameq/same_quant.
...
Instead print a warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 04:00:16 +02:00
Michael Niedermayer
Nicolas George
Ronald S. Bultje
Jean First
Matthieu Bouron
Stefano Sabatini
rogerdpack
Clément Bœsch