summaryrefslogtreecommitdiff
path: root/avconv.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: WavPack demuxer: do not rely on index when timestamp is not in indexed range. WavPack demuxer: store position of the first block in index. WavPack decoder: implement flush function avconv: Separate initialization from the main transcode loop. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Separate initialization from the main transcode loop.Alex Converse2011-08-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-20
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/avconv: replace forgotten av by avconv. avconv: reset input_ts_offset between files. doc/avconv: extend -ss documentation. avconv: call flush_encoders() from transcode() directly. avconv: fix broken indentation. avconv: rescue poor abused limit_filesize global. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: reset input_ts_offset between files.Anton Khirnov2011-08-19
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: call flush_encoders() from transcode() directly.Anton Khirnov2011-08-19
| | | | | | | | | | | | And remove now pointless parameter. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: fix broken indentation.Anton Khirnov2011-08-19
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: rescue poor abused limit_filesize global.Anton Khirnov2011-08-19
| | | | | | | | | | | | | | Keep a per-OutputFile instance of it, thus making -fs work with multiple output files. Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-19
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Set error code before before jumping to fail. h264: fix PCM intra-coded blocks in monochrome case Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Set error code before before jumping to fail.Alex Converse2011-08-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Fix spelling errors. aac: Only set sample rate and object type from ADTS if output hasn't been configured. aac: Set SBR and PS to unsignalled during headerless and ADTS initialization. aac: Only output configure if audio was found. avconv: save two levels of indentation in flush_encoders() avconv: factor flushing encoders out of output_packet(). avconv: factor out initializing input streams. avconv: remove -intra option. avconv: reset streamid_map between output files. avconv: make timer_start a local var in transcode(). avconv: cosmetics, move OutputStream. avconv: remove two unused macros. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Fix spelling errors.Alex Converse2011-08-18
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avconv: save two levels of indentation in flush_encoders()Anton Khirnov2011-08-18
| | | | | | | | | | | | | | | | | | | | | | By replacing if (foo) <do stuff> with if (!foo) continue; <do stuff>
| * avconv: factor flushing encoders out of output_packet().Anton Khirnov2011-08-18
| |
| * avconv: factor out initializing input streams.Anton Khirnov2011-08-18
| |
| * avconv: remove -intra option.Anton Khirnov2011-08-18
| | | | | | | | It's equivalent to -g 0.
| * avconv: reset streamid_map between output files.Anton Khirnov2011-08-18
| |
| * avconv: make timer_start a local var in transcode().Anton Khirnov2011-08-18
| |
| * avconv: cosmetics, move OutputStream.Anton Khirnov2011-08-18
| | | | | | | | Allows us to get rid of forward InputStream declaration.
| * avconv: remove two unused macros.Anton Khirnov2011-08-18
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: reindent.Anton Khirnov2011-08-17
| |
| * avconv: rescue poor abused start_time global.Anton Khirnov2011-08-17
| | | | | | | | | | Keep a per-OutputFile instance of it, thus making -ss work with multiple output files.
| * avconv: rescue poor abused recording_time global.Anton Khirnov2011-08-17
| | | | | | | | | | Keep a per-OutputFile instance of it, thus making -t work with multiple output files.
| * avconv: merge two loops in output_packet().Anton Khirnov2011-08-17
| |
| * avconv: fix broken indentation.Anton Khirnov2011-08-17
| |
| * avconv: get rid of the arbitrary MAX_FILES limit.Anton Khirnov2011-08-17
| |
| * avconv: get rid of the output_streams_for_file vs. ost_table schizophreniaAnton Khirnov2011-08-17
| | | | | | | | Instead store output streams in the same way as input streams.
| * avconv: add a wrapper for output AVFormatContexts and merge output_opts into itAnton Khirnov2011-08-17
| |
| * avconv: make itsscale syntax consistent with other options.Anton Khirnov2011-08-17
| | | | | | | | Move the stream specifier to the option name.
| * avconv: factor out adding input streams.Anton Khirnov2011-08-17
| |
| * avconv: Factorize combining auto vsync with format.Alex Converse2011-08-17
| |
| * avconv: Factorize video resampling.Alex Converse2011-08-17
| |
| * avconv: Don't unnecessarily convert ipts to a double.Alex Converse2011-08-17
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "avconv: use stream copy by default when possible." avconv: print stream copy information. avconv: use stream copy by default when possible. matroskaenc: vertical alignment. matroskaenc: implement query_codec() lavf: add avformat_query_codec(). lavc: add avcodec_get_type() for mapping codec_id -> type. flvenc: use int64_t to store offsets avconv: don't segfault on 0 input files. Do not write ID3v1 tags by default mpegts: log into an AVFormatContext rather than MpegTSContext. Conflicts: doc/APIchanges libavcodec/version.h libavformat/avformat.h libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "avconv: use stream copy by default when possible."Anton Khirnov2011-08-16
| | | | | | | | | | | | | | This reverts commit 4f4f33844a7369e5579912cc02f3c5376b1e6872. This commit has some ugly corner cases and needs to be discussed further.
| * avconv: print stream copy information.Anton Khirnov2011-08-16
| |
| * avconv: use stream copy by default when possible.Anton Khirnov2011-08-16
| |
| * avconv: don't segfault on 0 input files.Anton Khirnov2011-08-16
| |
* | avconv: Correct Copyright statement.Michael Niedermayer2011-08-17
| | | | | | | | | | | | | | | | this more than 4000 line file has less than 600 lines that are not in ffmpeg.c and they are largely cosmetic changes from ffmpeg.c. Thus the copyright statement from ffmpeg.c should be used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings avconv: remove a write-only variable avconv: remove pointless parameter from new_*_stream(). avconv: cosmetics, move code avconv: cosmetics -- move copy_chapters(). avconv: cosmetics -- move parse_forced_key_frames(). lavc: add audio flag to the 'b' option, deprecate 'ab'. avconv: rename sameq to same_quant doc/avconv: add forgotten end of chapter. Changelog: document avconv incompatibilities with ffmpeg. avconv: replace -vcodec/-acodec/-scodec with a better system. avconv: remove presets. svq3: propagate codec memory allocation failure in context init Conflicts: Changelog avconv.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove a write-only variableAnton Khirnov2011-08-16
| |
| * avconv: remove pointless parameter from new_*_stream().Anton Khirnov2011-08-16
| | | | | | | | New streams are always added to the last output file.
| * avconv: cosmetics, move codeAnton Khirnov2011-08-16
| | | | | | | | | | Move find_codec_or_die(), choose_codec(), new_output_stream() and read_avserver_streams() below transcode() where they belong.
| * avconv: cosmetics -- move copy_chapters().Anton Khirnov2011-08-16
| | | | | | | | | | It's only used in opt_output_file(), so move it right above opt_output_file().
| * avconv: cosmetics -- move parse_forced_key_frames().Anton Khirnov2011-08-16
| | | | | | | | | | parse_forced_key_frames() is only used in new_video_stream(), so move it right above new_video_stream().
| * lavc: add audio flag to the 'b' option, deprecate 'ab'.Anton Khirnov2011-08-16
| | | | | | | | | | | | Its only reason for its existence was ffmpeg's inability to properly assign AVOptions to streams. Now this is not a problem anymore, so 'ab' should go.
| * avconv: rename sameq to same_quantAnton Khirnov2011-08-16
| | | | | | | | | | It's often mistakenly used as 'same quality', emphasize that it's not true in the manual.
| * avconv: replace -vcodec/-acodec/-scodec with a better system.Anton Khirnov2011-08-16
| | | | | | | | | | | | | | 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]
| * avconv: remove presets.Anton Khirnov2011-08-16
| | | | | | | | | | Nothing except x264 uses them and native x264 presets should be used with private options.
* | avconv: fix uninitialized variableMichael Niedermayer2011-08-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 11:00:39 +0000