aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * ffmpeg: rename configure_filters() to configure_video_filters()Stefano Sabatini2011-05-101-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> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cmdutils: remove list_fmts(), simplifyStefano Sabatini2011-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The function was only used in opt_sample_fmt() for listing the sample formats. Move list_fmts() functionality directly into opt_sample_fmt(). Also fix the warning: ffmpeg.c: In function ‘opt_audio_sample_fmt’: ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’ Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Add missing CONFIG_AVFILTER check.Takashi Mochizuki2011-05-101-0/+2
| | | | | | | | | | | | Fix configure --disable-avfilter issue. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | "Initialize" copy_tb like the other global variables.Robert Leatherwood2011-05-111-1/+1
| |
* | ffmpeg: Fix -t with files that do not have any timestamps.Michael Niedermayer2011-05-101-1/+5
| | | | | | | | | | This for example fixes -t with some frext h264 reference streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-101-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegaudiodec: group #includes more sanely mpegaudio: remove #if 0 blocks ffmpeg.c: reset avoptions after each input/output file. ffmpeg.c: store per-output stream sws flags. mpegaudio: remove CONFIG_MPEGAUDIO_HP option mpegtsenc: Clear st->priv_data when freeing it udp: Fix receiving RTP data over multicast rtpproto: Remove an unused variable regtest: fix wma tests NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT regtest: separate flags for encoding and decoding Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg.c: reset avoptions after each input/output file.Anton Khirnov2011-05-091-0/+4
| | | | | | | | This is consistent with how all the other options work.
| * ffmpeg.c: store per-output stream sws flags.Anton Khirnov2011-05-091-8/+8
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Fix an oob array read. cosmetics: trim trailing whitespace in postproc Ban strncpy() it's too easy to misuse. psymodel: Remove wrapper functions. aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. regtest: remove redundant flags in jpg test regtest: use run_ffmpeg in do_image_formats regtest: simplify encoding functions ffmpeg.c: check for interlaced flag in the correct place. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg.c: check for interlaced flag in the correct place.Anton Khirnov2011-05-081-1/+1
| | | | | | | | In the corresponding codec context, not global options storage.
* | vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interfaceStefano Sabatini2011-05-071-4/+2
| | | | | | | | | | Now that pix_fmt, width, and height are directly embedded in the AVFrame, there is no need to pass these values as separate arguments.
* | ffmpeg: rename ost->pict_tmp to ost->resample_frameStefano Sabatini2011-05-071-7/+7
| | | | | | | | | | The new name is more consistent with the employed naming scheme, and more meaningful.
* | ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out()Stefano Sabatini2011-05-071-8/+3
| | | | | | | | Compact code, improve readability.
* | ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTERStefano Sabatini2011-05-071-2/+2
| | | | | | | | | | | | The check and the corresponding message in do_video_out() are unnecessary in the libavfilter path, as a similar check and message are performed within the buffer source.
* | ffmpeg: remove useless intermediary variable resample_dst in do_video_out()Stefano Sabatini2011-05-071-3/+2
| |
* | ffmpeg: simplify mid-stream reconfiguration when libavfilter is disabledStefano Sabatini2011-05-071-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | Implement lazy initialization of the image resample context, so that the initialization code does not need to be duplicated. Also manage the case in which resample/size change mid-stream. For each packet the code computes if resampling is needed. Previously the resample check was done only at the initialization, in case size/format changed and no resample was detected at the init stage ffmpeg was silently exiting.
* | lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()Stefano Sabatini2011-05-071-0/+1
| | | | | | | | | | | | | | | | avfilter_copy_frame_props() avoids code duplication and increases robustness. The added files libavfilter/avcodec.[ch] are used for containing utilities useful for gluing togheter libavfilter and libavcodec.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-051-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace strncpy() with av_strlcpy().Alex Converse2011-05-031-2/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-041-7/+78
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: Implement fate-rsync target Make ffmpeg support generic data stream Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make ffmpeg support generic data streamLuca Barbato2011-05-031-7/+78
| | | | | | | | The patch is the first step to support -dcodec copy
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vp8: frame-multithreading. Duplicate Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. Duplicate Replace deprecated av_get_pict_type_char() with av_get_picture_type_char(). Bug spoted&removed in last merge: dpx: Do not use DPX encoder for decoding. Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().Stefano Sabatini2011-05-021-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-1/+1
| |
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 19:28:42 +0000