summaryrefslogtreecommitdiff
path: root/avconv.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header mpeg124: use sign_extend() function ac3dec: use get_sbits() instead of manually sign-extending 4xm: fix signed overflow wmavoice: fix a signed overflow mpegvideo_enc: fix a signed overflow crc: fix signed overflow fate: run avconv with -nostats flag avtools: add -v as alias for -loglevel avconv: always print stats with AV_LOG_INFO doc/avconv: add forgotten output/per-stream info to -filter avconv: add -stats option to enable/disable printing encoding progress avconv: in output_packet() don't set decoded_data_size for video. avconv: remove pointless always true condition avconv: factorize common code in transcode_init() zmbv: remove memcpy() of decoded frame mpeg12enc: use sign_extend() function h264pred: use unsigned types for pixel values, fix signed overflows h264: fix signed overflows in x*0x01010101 expressions h264pred: remove unused variables Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avtools: add -v as alias for -loglevelMans Rullgard2011-10-09
| | | | | | | | | | | | This saves a bit of typing. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avconv: always print stats with AV_LOG_INFOAnton Khirnov2011-10-09
| | | | | | | | | | | | It's now possible to disable printing stats during encoding with -nostats, so there's no reason to print them differently depending on whether it's last report or not.
| * avconv: add -stats option to enable/disable printing encoding progressAnton Khirnov2011-10-09
| |
| * avconv: in output_packet() don't set decoded_data_size for video.Anton Khirnov2011-10-09
| | | | | | | | It's only used for audio.
| * avconv: remove pointless always true conditionAnton Khirnov2011-10-09
| |
| * avconv: factorize common code in transcode_init()Anton Khirnov2011-10-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) avconv: Reformat s16 volume adjustment. ARM: NEON optimised vector_fmac_scalar() dca: use vector_fmac_scalar from dsputil dsputil: add vector_fmac_scalar() latmenc: Fix private options vf_unsharp: store hsub/vsub in the filter context vf_unsharp: adopt a more natural order of params in apply_unsharp() vf_unsharp: rename method "unsharpen" to "apply_unsharp" vf_scale: apply the same transform to the aspect during init that is applied per frame vf_pad: fix "vsub" variable value computation vf_scale: add a "sar" variable lavfi: fix realloc size computation in avfilter_add_format() vsrc_color: use internal timebase lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() graphparser: prefer void * over AVClass * for log contexts avfiltergraph: use meaningful error codes avconv: Initialize return value for codec copy path. fate: use 'run' helper for seek-test fate: remove seek-mpeg2reuse test Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. ... Conflicts: doc/filters.texi libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/vf_scale.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Reformat s16 volume adjustment.Alex Converse2011-09-28
| |
| * avconv: Initialize return value for codec copy path.Alex Converse2011-09-27
| |
| * avconv: Fix volume adjustment for non-s16 sample formatsAlex Converse2011-09-27
| |
| * avconv: Make samples void*.Alex Converse2011-09-27
| | | | | | | | Different sample formats are different sizes.
| * avconv: Use the size of the decode sample format when allocating the audio ↵Alex Converse2011-09-27
| | | | | | | | samples buffer.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: use different variables for decoded and filtered frame. avconv: add support for copying attachments. matroskaenc: write attachments. matroskadec: export mimetype of attachments as metadata. avconv: factorize common code from new_*_stream() doc/avconv: expand documentation for some options. doc/avconv: document -timelimit. Conflicts: avconv.c cmdutils.c tests/codec-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: use different variables for decoded and filtered frame.Anton Khirnov2011-09-27
| | | | | | | | | | | | | | | | | | | | | | Makes the code less obfuscated and fixes encoding one video stream to several outputs. Also use avcodec_alloc_frame() instead of allocating AVFrame on stack. Breaks me_threshold in avconv, as motion vectors aren't passed through lavfi. They could be copied manually, but I don't think this misfeature is useful enough to justify ugly hacks.
| * avconv: add support for copying attachments.Anton Khirnov2011-09-27
| |
| * avconv: factorize common code from new_*_stream()Anton Khirnov2011-09-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) fate: allow testing with libavfilter disabled x86: XOP/FMA4 CPU detection support ws_snd: misc cosmetic clean-ups ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. ws_snd: use memcpy() and memset() instead of loops ws_snd: use samples pointer for loop termination instead of a separate iterator variable. ws_snd: make sure number of channels is 1 ws_snd: add some checks to prevent buffer overread or overwrite. ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. flacdec: fix buffer size checking in get_metadata_size() rtp: Simplify ff_rtp_get_payload_type rtpenc: Add a payload type private option rtp: Correct ff_rtp_get_payload_type documentation avconv: replace all fprintf() by av_log(). avconv: change av_log verbosity from ERROR to FATAL for fatal errors. cmdutils: replace fprintf() by av_log() avtools: parse loglevel before all the other options. oggdec: add support for Xiph's CELT codec sol: return error if av_get_packet() fails. cosmetics: reindent and pretty-print ... Conflicts: avconv.c cmdutils.c libavcodec/avcodec.h libavcodec/version.h libavformat/oggparsecelt.c libavformat/utils.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: replace all fprintf() by av_log().Anton Khirnov2011-09-26
| | | | | | | | Deprecate -v option, now only -loglevel is enough.
| * avconv: change av_log verbosity from ERROR to FATAL for fatal errors.Anton Khirnov2011-09-26
| |
| * avtools: parse loglevel before all the other options.Anton Khirnov2011-09-26
| | | | | | | | | | This way it can be applied to cmdutils too -- e.g. showing the banner and printing startup messages.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ppc: fix some pointer to integer casts ppc: fix 32-bit PIC build vmdaudio: fix decoding of 16-bit audio format. lavf: do not set codec_tag for rawvideo h264: check for out of bounds reads in ff_h264_decode_extradata(). flvdec: Check for overflow before allocating arrays avconv: use correct output stream index when checking max_frames avconv: remove fake coded_frame on streamcopy hack Conflicts: avconv.c libavcodec/h264.c libavcodec/ppc/asm.S libavcodec/vmdav.c libavformat/flvdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: use correct output stream index when checking max_framesAnton Khirnov2011-09-25
| |
| * avconv: remove fake coded_frame on streamcopy hackAnton Khirnov2011-09-25
| | | | | | | | | | | | Back in 2002 when it was added, some muxers used information from coded_frame. It's not true anymore, so this hack is useless and can be removed.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtp: factorize dynamic payload type fallback flvdec: Ignore the index if it's from a creator known to be different cmdutils: move grow_array out of #if CONFIG_AVFILTER avconv: actually set InputFile.rate_emu ratecontrol: update last_qscale_for sooner Fix unnecessary shift with 9/10bit vertical scaling prores: mark prores as intra-only in libavformat/utils.c:is_intra_only() prores: return more meaningful error values prores: improve error message wording prores: cosmetics: prettyprinting, drop useless parentheses prores: lowercase AVCodec name entry Conflicts: cmdutils.c libavcodec/proresdec_lgpl.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: actually set InputFile.rate_emuAnton Khirnov2011-09-23
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: use correct index when selecting metadata to write to.Anton Khirnov2011-09-11
| |
| * avconv: fix inverted variableAnton Khirnov2011-09-11
| |
| * avconv: move streamid_map to options context.Anton Khirnov2011-09-11
| |
| * avconv: extend -vf syntaxAnton Khirnov2011-09-11
| | | | | | | | | | Add a per-stream -filter option, make -vf an alias for -filter:v. Move vfilters to the options context.
| * avconv: move top_field_first to options context.Anton Khirnov2011-09-11
| |
| * avconv: move inter/intra matrix to options context.Anton Khirnov2011-09-11
| |
| * avconv: remove -psnr option.Anton Khirnov2011-09-11
| | | | | | | | It's redundant -- -flags +psnr does the same thing.
| * avconv: remove me_threshold option.Anton Khirnov2011-09-11
| | | | | | | | It's only shadowing the AVOption with the same name.
| * avconv: move video_rc_override_string to options context.Anton Khirnov2011-09-11
| |
| * avconv: move frame pixel format to the options context.Anton Khirnov2011-09-11
| | | | | | | | | | | | Also remove redundant -pix_fmt list syntax, it's inconsistent and only makes the code more complicated. -pix_fmts should be enough for everyone.
| * avconv: move frame aspect ratio to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move frame size to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move frame_rate to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move force_fps to the options context.Anton Khirnov2011-09-11
| |
| * avconv: move forced_key_frames to the options context.Anton Khirnov2011-09-11
| |
| * avconv: rewrite -qscale and -aq handling.Anton Khirnov2011-09-11
| | | | | | | | | | | | Merge video_qscale (set by -qscale) and audio_qscale (set by -aq) into one 'qscale' field in the options context. Add a shortcut -q for -qscale and make -aq an alias for -q:a.
| * avconv: move audio_sample_rate to the options context.Anton Khirnov2011-09-11
| |
| * cmdutils: add support for programs in check_stream_specifier()Anton Khirnov2011-09-11
| | | | | | | | Remove now redundant (and broken/undocumented) opt_programid.
| * avconv: move audio_sample_fmt to options context.Anton Khirnov2011-09-11
| | | | | | | | | | Also document it and replace undocumented and inconsistent '-sample_fmt list' syntax with -sample_fmts.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. avconv: move audio_channels to the options context. avconv: move *_disable to options context. avconv: remove -[vas]lang options. avconv: move codec tags to options context. cljr: init_get_bits size in bits instead of bytes indeo2: fail if input buffer too small indeo2: init_get_bits size in bits instead of bytes ffv1: Fixed size given to init_get_bits() in decoder. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: move audio_channels to the options context.Anton Khirnov2011-09-10
| |
| * avconv: move *_disable to options context.Anton Khirnov2011-09-10
| |
| * avconv: remove -[vas]lang options.Anton Khirnov2011-09-10
| | | | | | | | They are redundant, the same can be now accomplished with -metadata.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 18:59:11 +0000