summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'Michael Niedermayer2013-07-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9': rtsp: Support multicast source filters (RFC 4570) rtpproto: Check the source IP if one single source has been specified rtpproto: Support IGMPv3 source specific multicast inclusion Conflicts: libavformat/rtpproto.c libavformat/rtsp.c libavformat/rtsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support multicast source filters (RFC 4570)Ed Torbett2013-07-19
| | | | | | | | | | | | | | | | | | | | This supports inclusion of one single IP address for now, at the media level. Specifying the filter at the session level (instead of at the media level), multiple source addresses, exclusion, or using FQDNs instead of plain IP addresses is not supported (yet at least). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpproto: Check the source IP if one single source has been specifiedMartin Storsjö2013-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If another peer is sending unicast packets to the same port that we are listening on, those packets can end up being received despite using source specific multicast. For those cases, manually check the source address of received packets against the intended source address. This only handles the case when the source list is one single IP address for now, which probably is the most common case. Based on a patch by Ed Torbett. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpproto: Support IGMPv3 source specific multicast inclusionEd Torbett2013-07-19
| | | | | | | | | | | | | | | | | | Blocking/exclusion is not supported yet. The rtp protocol parameter takes the same form as the existing sources parameter for the udp protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffplay: use start_time as next audio pts on flush when seeking is not supportedMarton Balint2013-07-20
| | | | | | | | | | | | | | | | | | | | | | Theoretically using start_time should also work if seeking is available and we could determine that the next packet after a flush packet is the first packet of a stream, but I could not think of an easy and clean way to do that, that is why I sticked to the no seeking available condition for now. Fixes ticket #2647. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: estimate audio frame pts from the previous frame pts valuesMarton Balint2013-07-20
| | | | | | | | | | | | | | | | | | | | | | Previously we estimated the audio packet pts instead of the frame pts, therefore it only worked within a single packet (containing multiple frames). The new method works accross seperate audio packets as well and also handles better the case if a decoder buffers several packets before outputting a decoded frame. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify audio decodingMarton Balint2013-07-20
| | | | | | | | | | | | | | Also use negative stream_index for signaling obsolete audio packets. Using the size alone is not enough, because size is 0 for null packets as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* | avfilter/vf_separatefields: fix ;;Michael Niedermayer2013-07-20
| | | | | | | | | | Found-by: llogan Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Only change chapter ids if needed.Michael Niedermayer2013-07-19
| | | | | | | | | | | | | | | | This also fixes the case where negative chapter ids where input And fixes the case where remuxing from mkv changed chapter ids Found-by: Luca Barbato Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: fix preprocessor conditionwm42013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: add sepia example for colorchannelmixerLukasz Marek2013-07-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avutil/softfloat: remove unneeded include assert.hMichael Niedermayer2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/tiny_psnr: remove unneeded include assert.hMichael Niedermayer2013-07-19
| | | | | | | | | | | | This is the only such occurance on tests/ Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_yadif:remove unneeded include assert.hMichael Niedermayer2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: remove unneeded include assert.hMichael Niedermayer2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: silence unused variable warningMichael Niedermayer2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bmp: fix decoding of flipped rle4Piotr Bandurski2013-07-19
| | | | | | | | | | | | Fixes ticket #2794 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/input: fix 16bit gbrp inputMichael Niedermayer2013-07-19
| | | | | | | | | | | | Fixes Ticket2793 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples: demuxing: print ffplay command even if sample format is planarwm42013-07-19
| | | | | | | | | | Adjust the code so that a working ffplay command is printed in the planar audio case.
* | examples: demuxing: simplify audio outputwm42013-07-19
| | | | | | | | | | | | | | | | There is no reason why this should copy the audio data in a very complicated way. Also, strictly write the first plane, instead of writing the whole buffer. This is more helpful in context of the example. This way a user can clearly confirm that it works by playing the written data as raw audio.
* | examples: demuxing: do partial audio packet decodingwm42013-07-19
| | | | | | | | | | | | This assumes one audio packet is decoded one time. This is not true: packets can be partially decoded. Then you have to "adjust" the packet and pass the undecoded part of the packet to the decode function again.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-19
|\| | | | | | | | | | | | | | | | | | | * qatar/master: compat: Add missing license boilerplates Conflicts: compat/tms470/math.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * compat: Add missing license boilerplatesDiego Biurrun2013-07-18
| |
* | Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'Michael Niedermayer2013-07-19
|\| | | | | | | | | | | | | | | | | | | * commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da': Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/ Conflicts: compat/aix/math.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/Diego Biurrun2013-07-18
| | | | | | | | Also fix a comment and an #endif comment.
* | Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'Michael Niedermayer2013-07-19
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4': avserver: Remove unused loadable module support Conflicts: configure ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avserver: Remove unused loadable module supportMartin Storsjö2013-07-18
| | | | | | | | | | | | | | | | | | | | There is no record of this ever being used at all, anywhere, since the feature was added in 2effd274466. This gets rid of extra linker tricks just to support a feature that isn't used, simplifying portability to other platforms. Signed-off-by: Martin Storsjö <martin@martin.st>
* | img2enc: add option to use strftime() for filenameRamiro Polla2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: Support non subsampled 8bit planar pixel formatsMichael Niedermayer2013-07-18
| | | | | | | | | | | | Fixes file2.jp2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: parse CDEFMichael Niedermayer2013-07-18
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: libavcodec/jpeg2000dec.c Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-07-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix pix_fmt detection in the native jpeg2000 decoder. lavf/concat: Never fail for sample aspect ratio 0:1. lut3d: Fix reading 3dl files with leading comments. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fix pix_fmt detection in the native jpeg2000 decoder.Carl Eugen Hoyos2013-07-18
| | | | | | | | | | | | | | | | | | | | | Based on b7a928b by Michael Bradshaw. Fixes ticket #2683. Reviewed-by: Nicolas Bertrand
| * | lavf/concat: Never fail for sample aspect ratio 0:1.Carl Eugen Hoyos2013-07-18
| | | | | | | | | | | | | | | | | | Fixes ticket #2456. Reviewed-by: Nicolas George
| * | lut3d: Fix reading 3dl files with leading comments.Carl Eugen Hoyos2013-07-18
| | | | | | | | | | | | Fixes ticket #2787.
* | | avformat/rt*p: Joining a SSM multicast group using an SDP (Issue #2171)Ed Torbett2013-07-18
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Passes Source-Specific Multicast parameters read from an sdp file through to the UDP socket code, allowing source-specific multicast streams to be correctly received. As an integral part of this change, additional checking (currently only enabled in the case of SSM streams, but probably useful in similar scenarios) has been added to the RTP protocol handler to distinguish UDP packets arriving from multiple sources to the same port and process only the expected packets (those transmitted from the expected UDP source address). This resolves an issue identified when multiple instances of FFmpeg subscribe to different Source-Specific Multicast streams but with each sharing the same destination port. Signed-off-by: Edward Torbett <ed.torbett@simulation-systems.co.uk> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/scale: allocate interlaced scalers only if needed.Nicolas George2013-07-18
| | | | | | | | | | | | | | | | | | | | Fix "Value 0.000000 for parameter 'srch' out of range" error message when source or destination height is 1. Note: since the av_opt_set_int() calls are not checked for failure and the interlaced scalers are not actually used, this error has no consequence apart from a frightening message in the log.
* | vorbiscomment: Add DESCRIPTION to ff_vorbiscomment_metadata_convJames Almer2013-07-18
| | | | | | | | | | | | | | | | It's the official (or recommended) name for comment/description entries. See https://www.xiph.org/vorbis/doc/v-comment.html Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/riff: Add ITRK tagJames Almer2013-07-18
| | | | | | | | | | | | | | | | Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Consistently use "cpu_flags" as variable/parameter name for CPU flags Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideo.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Consistently use "cpu_flags" as variable/parameter name for CPU flagsDiego Biurrun2013-07-18
| |
* | Merge https://github.com/lukaszmluki/ffmpegMichael Niedermayer2013-07-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * https://github.com/lukaszmluki/ffmpeg: ftp: warning about pure-ftp server used as and output ftp: comments ftp: remove unused headers ftp: fix interrupt callback misuse Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ftp: warning about pure-ftp server used as and outputLukasz Marek2013-07-17
| | |
| * | ftp: commentsLukasz Marek2013-07-17
| | |
| * | ftp: remove unused headersLukasz Marek2013-07-17
| | |
| * | ftp: fix interrupt callback misuseLukasz Marek2013-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FTP protocol used interrupt callback to simulate nonblock operation which is a misuse of this callback. This commit make FTP protocol fully blocking and removes invalid usage of interrutp callback Also adds support for multiline responses delimited with dashes
* | | vf_scale: use sws_init_context()Michael Niedermayer2013-07-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavf/matroskaenc: using valid chapter idsFabian Neundorf2013-07-18
| | | | | | | | | | | | | | | | | | | | | Fixes ticket 2790, by starting the ChapterUIDs in mkv files with 1 instead of a 0.   Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale/options: fix copy and paste typoMichael Niedermayer2013-07-17
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fixing a stride issue in VP8 Alpha encodeVignesh Venkatasubramanian2013-07-17
| | | | | | | | | | | | | | | | When encoding alpha channel in libvpx, the stride isn't set properly for the alpha encoder. Fixing it. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: simplify mkv_check_tag()Michael Niedermayer2013-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 16:27:31 +0000