summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* 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>
| * streamid does not work with newaudio, newvideo, newsubtitleMike Scheutzow2011-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes issue2465. The problem is that the ffmpeg (the app) -streamid option did not work with -newaudio/-newvideo/-newsubtitle. The cause was a conflict between the feature where streamid values were reset to default for each output filename, and the implementation of -new*, which requires that the -new* option be specified after the target filename. My patch changes the ffmpeg behavior so that user-specified streamid values apply to all the following output files on the command line (rather than just the next output filename.) Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | Do not use AVFMT_FLAG_NONBLOCK for the output file.Carl Eugen Hoyos2011-03-08
| | | | | | | | Allows to use output device alsa.
* | avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-08
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* | Make sure the first q press doesnt f*ck up the protocols and thus written files.Michael Niedermayer2011-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix seting of decode_interrupt_cb()Michael Niedermayer2011-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-05
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
* | ffmpeg: Use av_pkt_dump_log2Martin Storsjö2011-03-03
| | | | | | | | | | | | | | | | This makes dumped packet timestamps proper for streams with timebases other than AV_TIME_BASE. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8)
* | avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
* | Fix issue2619.Michael Niedermayer2011-02-19
| | | | | | | | | | | | regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-18
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Restructure video filter implemenattion in ffmpeg.c.Michael Niedermayer2011-02-14
| | | | | | | | | | | | This fixes several bugs like multiple outputs and -aspect mixed with -vf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Deprecate avcodec_thread_init()Alexander Strange2011-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> (cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6)
* | Implement guessed_pts in avcodec_decode_video2Nicolas George2011-02-07
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix opt_values leakJames Zern2011-02-06
| | | | | | | | | | | | | | Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)
* | Adopt pkt_dts/pkt_pts in lavc clientsAlexander Strange2011-02-06
| | | | | | | | | | | | | | No behavior change; this makes DTS reliable with the next patch. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)
* | Use avformat_free_context for cleaning up muxersMartin Storsjö2011-02-06
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)
* | Make avfilter_graph_free() free the graph.Stefano Sabatini2011-02-06
| | | | | | | | | | | | | | | | | | | | | | 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> (cherry picked from commit 4359288c565705d1734f63d277f8918ee5af5e54)
* | ffmpeg.c: rename map_meta_data option to map_metadataAnton Khirnov2011-02-04
| | | | | | | | | | | | | | It's consistent with the -metadata option and easier to write. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)
* | Add sample_aspect_ratio fields to vsrc_buffer arguments.Michael Niedermayer2011-01-31
| | | | | | | | | | This fixes aspect handling in ffmpeg This is based on a patch by baptiste
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 18:56:51 +0000