aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* replace deprecated av_get_pict_type_char() with av_get_picture_type_char()Stefano Sabatini2011-05-021-1/+1
|
* lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratioStefano Sabatini2011-05-011-1/+1
| | | | | | | | | Improve consistency with libavcodec. This breaks libavfilter API/ABI. The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously done with the lavfi minor number.
* lavc: add a sample_aspect_ratio field to AVFrameStefano Sabatini2011-05-011-4/+3
| | | | | | | The sample aspect ratio is a per-frame property, so it makes sense to define it in AVFrame rather than in the codec/stream context. Simplify application-level sample aspect ratio information extraction, and allow further simplifications.
* FFMPEG: support demuxer specific options.Michael Niedermayer2011-04-301-1/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers.Michael Niedermayer2011-04-301-20/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-301-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Duplicate AMV: disable DR1 and don't override EMU_EDGE Duplicate lavf: inspect more frames for fps when container time base is coarse Wrong and we have correct fix: Fix races in default av_log handler vorbis: Replace sized int_fast integer types with plain int/unsigned. Remove disabled non-optimized code variants. NO bswap.h: Remove disabled code. Remove some disabled printf debug cruft. Replace more disabled printf() calls by av_dlog(). NO tests: Remove disabled code. NO Replace some commented-out debug printf() / av_log() messages with av_dlog(). vorbisdec: Replace some sizeof(type) by sizeof(*variable). NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. Conflicts: libavcodec/h264.c libavcodec/vorbisdec.c libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove some disabled printf debug cruft.Diego Biurrun2011-04-291-1/+0
| |
* | Revert buggy hunk that leaked in from a libav merge.Michael Niedermayer2011-04-271-4/+0
| | | | | | | | | | This unbreaks compilation with --disable-avfilter. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vsrc_buffer: add sample_aspect_ratio fields to arguments.Michael Niedermayer2011-04-261-2/+16
| | | | | | | | | | | | | | | | This fixes aspect handling in ffmpeg. This is based on a patch by Baptiste. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | vsrc_buffer: Set output sizeMichael Niedermayer2011-04-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-241-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Lowercase all ff* program names.Diego Biurrun2011-04-231-2/+2
| |
* | Cosmetics: Rename variable daemon as run_as_daemon.Carl Eugen Hoyos2011-04-221-5/+5
| | | | | | | | daemon() is defined in unistd.h for BSD and Cygwin.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition. Introduce slice threads flag. FATE: allow forcing thread-type when doing threaded fate runs. Use av_log_ask_for_sample() where appropriate. error: sort, pack, and align error code and string definitions The stabilization period after version bumps should be one month, not one week. applehttp: Expose the stream bitrate via metadata doc: Add some initial docs on the applehttp demuxer Provide a fallback version of the libm function trunc libavdevice: Define _XOPEN_SOURCE for usleep lavc: provide deprecated avcodec_thread_init until next major version lavc: provide the opt.h header until the next bump error: change AVERROR_EOF value error: remove AVERROR_NUMEXPECTED error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c Conflicts: libavcodec/h264.c libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error: remove AVERROR_NUMEXPECTEDStefano Sabatini2011-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and has a too much specific meaning, which is better explained through a log message. Thus it can be replaced by AVERROR(EINVAL). This breaks API. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ffmpeg: call pre_process_video_frame() only if decoding is neededStefano Sabatini2011-04-211-7/+3
| | | | | | | | | | | | | | | | | | | | | | In output_packet(), move the pre_process_video_frame() call inside the if (ist->decoding_needed) { } block. This way pre_process_video_frame() is not called when stream-copy has been selected. Also simplify. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | In libx264 wrapper, correctly support 2pass log filename option.Baptiste Coudurier2011-04-201-3/+9
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-201-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prefer avio_check() over url_exist()Stefano Sabatini2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with url_exist() is that it tries to open a resource in RDONLY mode. If the file is a FIFO and there is already a reading client, the open() call will hang. By using avio_check() with access mode of 0, the second reading process will check if the file exists without attempting to open it, thus avoiding the lock. Fix issue #1663. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-191-1/+1
| | | | | | | | | | | | | | | | Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API.
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-191-1/+1
| |
| * lavf: remove FF_API_MAX_STREAMS cruftAnton Khirnov2011-04-191-2/+0
| |
| * Redefine sameqLou Logan2011-04-101-1/+1
| | | | | | | | | | | | | | | | I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ffmpeg: reformat resample condition code in transcode()Stefano Sabatini2011-04-191-3/+3
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg: factorize resampling condition check in do_video_out()Stefano Sabatini2011-04-191-8/+7
| | | | | | | | | | | | Simplify and improve readability. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippetStefano Sabatini2011-04-191-2/+2
| | | | | | | | | | | | Simplify, ease readability. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg: improve reporting if size/pixel format changesStefano Sabatini2011-04-191-2/+5
| | | | | | | | | | | | | | | | | | | | Use av_log() rather than fprintf(stderr, ...), and show information related to the previous size/pixel format configuration. Consistent with the corresponding message issued in case of audio configuration change. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg: remove unused fields AVOutputStream.original_width/heightStefano Sabatini2011-04-191-7/+0
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg: remove unused variable padding_src in do_video_out()Stefano Sabatini2011-04-191-3/+1
| | | | | | | | Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg:Daemon mode, add -d as first option to try it.Michael Niedermayer2011-04-191-1/+20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg:Fix negative verbositiyMichael Niedermayer2011-04-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix -aspect cli optionBaptiste Coudurier2011-04-161-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign the way -aspect option is handled. This is done by making ffmpeg read the sample aspect ratio set in the corresponding input stream by default, and overriding it using the value specified by -aspect. If the output display aspect ratio is specified with -aspect, it is set at the end of the filterchain, thus overriding the value set by filters in the filterchain. This implementation is more robust, since does not modify the filterchain description (which was creating potential syntax errors).
* | ffmpeg: use parse_number_and_die() when it makes senseStefano Sabatini2011-04-161-21/+18
| | | | | | | | | | | | | | | | | | Prefer parse_number_or_die() over atoi()/atol() parsing for the options: -pass, -top, -vc, and -qscale. Improve input validation. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | ffmpeg: rename configure_filters() to configure_video_filters()Stefano Sabatini2011-04-111-2/+2
| | | | | | | | | | | | | | | | Mostly useful for the audio-filters branch, to make more apparent the distinction between configure_audio_filters() and configure_video_filters(). Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-091-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: get rid of ffm-specific stuff in avformat.hAnton Khirnov2011-04-081-0/+2
| |
| * lavf: rename avf_sdp_create to av_sdp_create.Anton Khirnov2011-04-081-1/+1
| | | | | | | | The new name is more consistent with the rest of the API.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-081-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: avio_ prefix for url_set_interrupt_cb.Anton Khirnov2011-04-071-2/+2
| |
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-071-1/+1
| |
* | Fix ticket20Michael Niedermayer2011-04-061-7/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "ffmpeg: fix aspect ratio setting"Michael Niedermayer2011-04-061-10/+12
| | | | | | | | | | This reverts commit d1eb50bb29caad9745631759265f475177df99b9. Reason, it breaks fate
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-061-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: psymodel: extend API to include PE and bit allocation. avio: always compile dyn_buf functions Remove unnecessary parameter from ff_thread_init() and fix behavior Revert "aac_latm_dec: use aac context and aac m4ac" configure: tell user if libva is enabled like the rest of external libs. Add silence support for AV_SAMPLE_FMT_U8. avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal avio: deprecate av_url_read_seek avio: deprecate av_url_read_pause ac3enc: NEON optimised extract_exponents Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add silence support for AV_SAMPLE_FMT_U8.Alex Converse2011-04-051-1/+9
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix crash in ffmpeg.c with PIX_FMT_NONEMichael Niedermayer2011-04-061-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix aspect ratio settingStefano Sabatini2011-04-051-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by adding a setsar filter at the beginning of the configured filterchain. This implementation is more robust, since does not modify the filterchain description (which was creating potential syntax errors), but directly modifies the filterchain structure. This also changes the ffmpeg -aspect behavior, as following filters in the filterchain can change the DAR/SAR set by the inserted setsar filter. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Redefine sameqLou Logan2011-04-051-1/+1
| | | | | | | | | | | | | | I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: make 'bits_per_raw_sample' option more usefulPeter Ross2011-04-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently bits_per_raw_sample is exposed as an AVCodecContext option. The option is not very useful, because ffmpeg 1) overwrites it with a value from the upstream codec, or 2) it resets the value whenever the video is resampled. This patch adds the -bits_per_raw sample option to FFmpeg, and caches the value like is done for the -pix_fmt option. Example usage: ffmpeg v210.avi -pix_fmt rgb48 -bits_per_raw_sample 10 out%d.dpx Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support changing pixel formats on avfilter input.Michael Niedermayer2011-04-031-2/+3
| | | | | | | | | | Fix issue2217 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:12:21 +0000