summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-08
| |
| * lavf: rename avf_sdp_create to av_sdp_create.Anton Khirnov2011-04-08
| | | | | | | | The new name is more consistent with the rest of the API.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07
| |
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
* | Fix ticket20Michael Niedermayer2011-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "ffmpeg: fix aspect ratio setting"Michael Niedermayer2011-04-06
| | | | | | | | | | This reverts commit d1eb50bb29caad9745631759265f475177df99b9. Reason, it breaks fate
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix crash in ffmpeg.c with PIX_FMT_NONEMichael Niedermayer2011-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix aspect ratio settingStefano Sabatini2011-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05
| | | | | | | | | | | | | | 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-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | Fix issue2217 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix stream mapping regressionMichael Niedermayer2011-04-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Another aspect ratio fix try. This leaves the setdar addition at the end ↵Michael Niedermayer2011-04-01
| | | | | | | | | | | | (preferred by people). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Increase ffmpeg video encoding buffer size to permit encoding of DPX imagesPeter Ross2011-04-01
| | | | | | | | The header generated by the DPX encoder is 1664 bytes.
* | Insert setdar at the begin of a filter chain instead the end.Michael Niedermayer2011-04-01
| | | | | | | | | | | | This fixes -vf setsar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Do no modify terminal parameters using termios.h"Michael Niedermayer2011-03-31
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb48e245e6e770f146220fac0a8bd4dc1a5e006c. Reason being we like pressing "q" to quit ffmpeg. Conflicts: ffmpeg.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: warns the user when the selected pixel format is ignoredStefano Sabatini2011-03-27
| |
* | cmdutils: remove list_fmts(), simplifyStefano Sabatini2011-03-26
| | | | | | | | | | | | | | | | | | | | | | The function was only used in opt_sample_fmt() for listing the sample formats. Move list_fmts() functionality directly into opt_sample_fmt(). Als 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)’
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add audio_service_type field to AVCodecContext for encoding and reportingJustin Ruggles2011-03-25
| | | | | | | | of the service type in the audio bitstream.
* | ffmpeg: include conditionally the sws_flags variableStefano Sabatini2011-03-25
| | | | | | | | | | | | | | The variable is not used when libavfilter is enabled. Fix the warning: ffmpeg.c: At top level: ffmpeg.c:242: warning: ‘sws_flags’ defined but not used
* | Make multiple Ctrl-C capable to kill stuck protocols.Michael Niedermayer2011-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make sure kbhit() is in conio.hDave Yeo2011-03-22
| | | | | | | | | | | | | | | | Conio.h is a non-standard header and may not have kbhit() prototyped. This fixes compile on OS/2 where the EMX version (we're using a fork) of conio.h only has getch() and getche(). Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do no modify terminal parameters using termios.hPanagiotis H.M. Issaris2011-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove usage of tcgetattr and tcsetattr to modify terminal parameters, and rely on ctrl-c to stop instead of pressing 'q'. On systems with conio.h, keep the old behavior. Changing the terminal settings causes problems if multiple instances are running asynchronously on the same terminal, such as during a parallel FATE run, or if the process crashes before restoring the terminal. In both cases, the terminal state is messed up requiring a manual reset. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-21
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: modify help text for the map optionStefano Sabatini2011-03-20
| | | | | | | | | | | | | | | | | | | | Change "file:stream[:syncfile:syncstream]" to "file.stream[:syncfile.syncstream]", the latter syntax is more consistent with the stream identifier form printed by av_dump_format(), and more readable. Both syntaxes are currently accepted by the opt_map() code. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Fix compilation error when CONFIG_AVFILTER is not defined.Thierry Foucu2011-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'master' of git://git.ffmpeg.org/ffmpegMichael Niedermayer2011-03-12
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: remove unused variable in ffmpeg_exit()Stefano Sabatini2011-03-12
| | | | | | | | | | | | | | | | Fix the warning: ffmpeg.c: In function ‘ffmpeg_exit’: ffmpeg.c:509: warning: unused variable ‘j’ Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ffmpeg: Use av_pkt_dump_log2Martin Storsjö2011-03-02
| | | | | | | | | | | | | | This makes dumped packet timestamps proper for streams with timebases other than AV_TIME_BASE. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-16
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Deprecate avcodec_thread_init()Alexander Strange2011-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As a side effect of the last commit, avcodec_open() now calls it automatically, so there is no longer any need for clients to call it. Instead they should set AVCodecContext.thread_count. avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the next MAJOR libavcodec bump. Rename the functions to ff_thread_init/free, since they are now internal. Wrappers are provided to maintain API compatibility. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * cmdutils: fix opt_values leakJames Zern2011-02-05
| | | | | | | | | | | | Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Adopt pkt_dts/pkt_pts in lavc clientsAlexander Strange2011-02-05
| | | | | | | | | | | | No behavior change; this makes DTS reliable with the next patch. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Use avformat_free_context for cleaning up muxersMartin Storsjö2011-02-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-04
| | | | | | | | | | | | | | | | | | | | Make avfilter_graph_free() free not only the internal structures, but also the allocated graph, and set the graph pointer to NULL for increased safety. Simplify usage. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ffmpeg.c: rename map_meta_data option to map_metadataAnton Khirnov2011-02-02
| | | | | | | | | | | | It's consistent with the -metadata option and easier to write. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * Make ffmpeg warns the user when the selected sample format is ignored.Stefano Sabatini2011-01-31
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make local variables static.Diego Elio Pettenò2011-01-25
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Do not set audio_resample to 0 if audio_sync_method is > 1.Stefano Sabatini2011-01-24
| | | | | | | | | | | | | | | | | | | | If audio_sync_method is >1 the resampler is used for audio drift compensation, and do_audio_out() was causing an assert failure because audio_resample was not set. Fix issue 2516, which was introduced by SVN r25939. Signed-off-by: Mans Rullgard <mans@mansr.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 00:39:48 +0000