aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* lavf/applehttp: add log message in case of applehttp_read_header() failureStefano Sabatini2012-06-291-0/+1
| | | | Improve error reporting.
* Replace Libav with FFmpeg in license headers for files created by mePaul B Mahol2012-06-294-16/+16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-284-133/+189
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flv: add support for G.711 doc: git: Add checklist with test steps to perform before pushing flvenc: K&R formatting cosmetics movenc: Add channel layouts for PCM. Conflicts: libavformat/flvenc.c tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: add support for G.711Damien Fetis2012-06-283-0/+18
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * flvenc: K&R formatting cosmeticsLuca Barbato2012-06-281-132/+142
| |
| * movenc: Add channel layouts for PCM.Alex Converse2012-06-271-0/+26
| |
* | udp: use av_freep() instead of av_free()Michael Niedermayer2012-06-281-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add proper enum type for fmt ctx duration esitmation methodMichael Bradshaw2012-06-282-7/+14
| | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-282-2/+119
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mss1: validate number of changeable palette entries mss1: report palette changed when some additional colours were decoded x86: fft: replace call to memcpy by a loop udp: Support IGMPv3 source specific multicast and source blocking dxva2: include dxva.h if found libm: Provide fallback definitions for isnan() and isinf() tcp: Pass NULL as hostname to getaddrinfo if the string is empty tcp: Set AI_PASSIVE when the socket will be used for listening Conflicts: configure libavcodec/mss1.c libavformat/udp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Support IGMPv3 source specific multicast and source blockingMartin Storsjö2012-06-271-1/+113
| | | | | | | | | | | | Based on an original patch by Stephen D'Angelo <SDAngelo@evertz.com>. Signed-off-by: Martin Storsjö <martin@martin.st>
| * tcp: Pass NULL as hostname to getaddrinfo if the string is emptyJordi Ortiz2012-06-271-1/+4
| | | | | | | | | | | | | | This gives you the proper v4 or v6 version of the "any address", allowing receiving connections on any address on the machine. Signed-off-by: Martin Storsjö <martin@martin.st>
| * tcp: Set AI_PASSIVE when the socket will be used for listeningJordi Ortiz2012-06-271-0/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | http: try to detect live akamai streams and dont enable seeking for themMichael Niedermayer2012-06-281-1/+5
| | | | | | | | | | | | Fixes ticket1320 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: fix occasional crash on shutdownEric Petit2012-06-271-1/+1
| | | | | | | | | | | | Wait until the thread is down before destroying the fifo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-278-13/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: add an assert to silence an uninitialized variable warning. avconv: shut up an uninitialized variable warning. avfiltergraph: shut up uninitialized variable warning. af_join: initialize a variable to shut up gcc warning. amix: fix format specifier for AVFilterLink.sample_rate. lavfi: make filters less verbose. mpc8: read APE tags. lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes libm: provide fallback definition for cbrtf() using powf() network: Don't redefine error codes if they already exist in errno.h configure: Check for sys/time.h network: Include unistd.h from network.h avconv: don't include vsrc_buffer.h, which doesn't exist anymore lavfi: reorder AVFilterLink fields. lavfi: reorder AVFilterContext fields. lavfi: reorder AVFilter fields. lavfi: reorder AVFilterBufferRef fields. lavfi: reorder AVFilterBuffer fields. Conflicts: configure libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_crop.c libavfilter/vf_drawbox.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vsrc_color.c libavformat/network.h libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpc8: read APE tags.Anton Khirnov2012-06-262-1/+8
| |
| * network: Don't redefine error codes if they already exist in errno.hRonald S. Bultje2012-06-262-0/+17
| | | | | | | | | | | | | | | | Since the errno.h values don't match the error codes that winsock returns, map the winsock error codes to the errno ones, to make sure explicit checks against AVERROR(x) match. Signed-off-by: Martin Storsjö <martin@martin.st>
| * configure: Check for sys/time.hRonald S. Bultje2012-06-261-0/+2
| | | | | | | | | | | | | | | | Apparently this include is needed on some systems for building the poll fallback (for the timeval struct for select?), but it isn't available on all systems. Thus only include it if it exists. Signed-off-by: Martin Storsjö <martin@martin.st>
| * network: Include unistd.h from network.hMartin Storsjö2012-06-264-3/+4
| | | | | | | | | | | | | | | | | | | | | | This heaader is required for close() for sockets in network code. For winsock, the equivalent function is defined in the winsock2.h header. This avoids having the HAVE_UNISTD_H in all files dealing with raw sockets. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mov: do not try to read total disc/track number if data atom is too short.Carl Eugen Hoyos2012-06-261-2/+3
| | | | | | | | | | | | Fixes bug 308. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-251-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wtv: Check the return value from gmtime x86: fft: convert sse inline asm to yasm x86: place some inline asm under #if HAVE_INLINE_ASM Conflicts: libavcodec/x86/fft_sse.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: Check the return value from gmtimeMartin Storsjö2012-06-251-3/+15
| | | | | | | | | | | | | | | | On MSVC, gmtime returns NULL for values outside of their supported range (and these show up in our fate test). This doesn't seem to affect the actual fate test result. Signed-off-by: Martin Storsjö <martin@martin.st>
* | vocenc: use new header from codec tag 4Michael Niedermayer2012-06-251-1/+1
| | | | | | | | | | | | this matches sox and should fix ticket1119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vocenc: change default codec to 16bitMichael Niedermayer2012-06-251-1/+1
| | | | | | | | | | | | | | Hardly anyone would want 8bit today, 16bit is a much more reasonable default. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vocenc: fix sample rate rounding directionMichael Niedermayer2012-06-251-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-244-11/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Only include unistd.h if configure found it ape: create audio stream before reading tags. mov: make a length variable larger. image2: Add "start_number" private option to the demuxer image2: Add "start_number" private option to the muxer avconv: remove a forgotten debugging printf. avconv: use more descriptive names for hardcoded filters. avconv: remove redundant handling of async. doc/filters: fix typo. h264: use asm cabac reader under a generic condition Conflicts: ffmpeg.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ape: create audio stream before reading tags.Anton Khirnov2012-06-241-6/+6
| | | | | | | | | | | | | | Tags may contain attached picture, which will be exported as video streams. This ensures that the audio stream is always the first.
| * mov: make a length variable larger.Anton Khirnov2012-06-241-2/+2
| | | | | | | | | | Right now, it's uint16_t, but for itunes metadata a 32bit number is stored in it.
| * image2: Add "start_number" private option to the demuxerMashiat Sarker Shakkhar2012-06-241-3/+6
| | | | | | | | | | | | | | Currently if a pattern is given we look for up to the fifth file name in the sequence. This option sets that limit to an arbitrary number. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * image2: Add "start_number" private option to the muxerMashiat Sarker Shakkhar2012-06-241-2/+18
| | | | | | | | | | | | | | | | | | This adds the capability to start counting file number from an arbitrary integer. This includes a few lines of trivial code from FFmpeg codebase. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | image2: Add "start_number" private option to the demuxerMashiat Sarker Shakkhar2012-06-241-4/+6
| | | | | | | | | | | | | | Currently if a pattern is given we search for up to the fifth file name in that sequence. This option sets that limit to an arbitrary number. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | image2: Add "start_number" private option to the muxerMashiat Sarker Shakkhar2012-06-231-1/+1
| | | | | | | | | | | | | | This adds the capability to start counting file number from an arbitrary integer instead of always starting at 1. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-225-14/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace usleep() calls with av_usleep()Mans Rullgard2012-06-224-10/+8
| | | | | | | | | | | | | | This reduces the dependency on unistd.h which is not available on all systems. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: include libavutil/time.h instead of redeclaring av_gettime()Mans Rullgard2012-06-211-4/+4
| | | | | | | | | | | | This avoids some warnings about redundant declarations. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | avformat: offset fps calculation by one to include 60.00 fpsHendrik Leppkes2012-06-221-3/+3
| | | | | | | | | | | | | | To ensure the full range of values is still used, also adjust all uses of this function to loop from 0 instead of 1. This way only 60.00 is added and nothing lost. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-213-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fix hardcoded tables compililation caused by missing math constants lavf: Make codec_tag arrays constant twinvq: give massive struct a name. lavf, lavu: version bumps and APIchanges for av_gettime() move lavfi/audio: don't set cur_buf in ff_filter_samples(). lavfi/fifo: add audio version of the fifo filter. fifo: fix parenthesis placement. lavfi: rename vf_fifo.c -> fifo.c lavc: remove stats_in from AVCodecContext options table. Conflicts: doc/APIchanges libavfilter/Makefile libavfilter/allfilters.c libavfilter/audio.c libavfilter/fifo.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Make codec_tag arrays constantRonald S. Bultje2012-06-212-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf, lavu: version bumps and APIchanges for av_gettime() moveMans Rullgard2012-06-211-2/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: add a real SRT muxer.Nicolas George2012-06-213-13/+100
| | | | | | | | | | | | | | This muxer supports CODEC_ID_SRT with the timestamps in the packet data and CODEC_ID_TEXT with the timestamps in the packet fields. Makes -scodec copy work from Matroska.
* | smush: set audio packet durationPaul B Mahol2012-06-211-0/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain ↵Hendrik Leppkes2012-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | that data. According to the specification on the MSDN [1], 0 is valid for that particular field, and it should be ignored in that case. [1]: http://msdn.microsoft.com/en-us/library/windows/desktop/dd757714(v=vs.85).aspx Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add 48 fps to the NTSC frameratesHendrik Leppkes2012-06-212-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | LucasArts SMUSH demuxerPaul B Mahol2012-06-214-1/+235
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-2018-46/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MS Screen 1 decoderKostya Shishkov2012-06-201-0/+1
| |
| * Move av_gettime() to libavutilMans Rullgard2012-06-203-9/+9
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mov: fix operator precedence bugRonald S. Bultje2012-06-201-1/+1
| |
| * Remove unnecessary inclusions of [sys/]time.hMans Rullgard2012-06-207-7/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: remove unnecessary inclusions of unistd.hMans Rullgard2012-06-204-4/+0
| | | | | | | | | | | | These files do not use anything provided by unistd.h. Signed-off-by: Mans Rullgard <mans@mansr.com>