summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
| * url: Document the expected behaviour of url_readNicolas George2012-03-19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Use AVFormatContext.probesize in init_inputMartin Storsjö2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | This was forgotten in the transition from av_open_input_file to avformat_open_input, see 603b8bc2a1. This doesn't change anything for the default case where the option isn't set, since PROBE_BUF_MAX is 1048576 (which was used as max probe size earlier) while the default value for the probesize option is 5000000, which for the probe function is clipped to PROBE_BUF_MAX anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
| * cosmetics: Align some AVInput/OutputFormat declarationsMartin Storsjö2012-03-19
| | | | | | | | | | | | Also add missing trailing commas. Signed-off-by: Martin Storsjö <martin@martin.st>
| * oma: Fix out of array read.Michael Niedermayer2012-03-18
| | | | | | | | | | | | | | | | | | | | | | Input: 01-Untitled-partial.oma ZZUF params: zzuf[s=7157,r=0.001] Fixes Bugzilla #106 Bug-found-by: darkshikari Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | mp3_probe: consider id3 tags to be low scoring mp3.Michael Niedermayer2012-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet functionMatthieu Bouron2012-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Tell users about supported audio samplerates in mmf.Carl Eugen Hoyos2012-03-19
| |
* | ZeroCodec DecoderDerek Buitenhuis2012-03-19
| | | | | | | | | | | | | | | | An obscure Japanese lossless video codec, originally intended for use with a remote desktop application. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: make compare() function compatible with POSIX bc Update Janne's email address. APIchanges: Replace Subversion revision numbers by Git hashes. bytestream: Eliminate one level of pointless macro indirection. xwd: convert to bytestream2. vqavideo: port to bytestream2 API Read preset files with suffix .avpreset prores: allow user to set fixed quantiser lavf: remove some disabled code. lavf: only set average frame rate for video. lavf: remove a pointless check. avcodec: add XBM encoder Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h libavcodec/vqavideo.c libavformat/img2enc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove some disabled code.Anton Khirnov2012-03-17
| |
| * lavf: only set average frame rate for video.Anton Khirnov2012-03-17
| |
| * lavf: remove a pointless check.Anton Khirnov2012-03-17
| | | | | | | | Timebase is already checked in avpriv_set_pts_info().
| * avcodec: add XBM encoderPaul B Mahol2012-03-17
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | mxfdec: Let pkt->pts = mxf->current_edit_unit if intra-onlyTomas Härdin2012-03-18
| | | | | | | | | | | | | | We can't do this in general since we could be reading a file with B-frames while lacking an index. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: fix non-blocking and interrupt handling.Nicolas George2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | In non-blocking mode, lowest-level read protocols are supposed block only for a short amount of time to let retry_transfer_wrapper() check for interrupts. Also, checking the interrupt_callback in the receiving thread is wrong, as interrupt_callback is not guaranteed to be thread-safe and the job is already done by retry_transfer_wrapper(). The error code was also incorrect. Bug reported by Andrey Utkin.
* | url: document url_read exact behaviour.Nicolas George2012-03-17
| |
* | matroskadec: Fix null pointer exception on corrupted input.Michael Niedermayer2012-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dxa: remove useless code lavf: don't select an attached picture as default stream for seeking. avconv: remove pointless checks. avconv: check for get_filtered_frame() failure. avconv: remove a pointless check. swscale: convert hscale() to use named arguments. x86inc: add *mp named argument support to DEFINE_ARGS. swscale: convert hscale to cpuflags(). Conflicts: ffmpeg.c libswscale/x86/scale.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: don't select an attached picture as default stream for seeking.Anton Khirnov2012-03-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: stricter reference limit enforcement. h264: increase reference poc list from 16 to 32. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. snow: check reference frame indices. snow: reject unsupported chroma shifts. Add ffvhuff encoding and decoding regression test anm: convert to bytestream2 API bytestream: add more unchecked variants for bytestream2 API jvdec: unbreak video decoding jv demux: set video stream duration fate: add pam image regression test Conflicts: libavcodec/adpcm.c libavcodec/anm.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/snowdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jv demux: set video stream durationPaul B Mahol2012-03-14
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | matroskaenc: change cluster_pos to use -1 as the "I'm not currently working ↵Aaron Colwell2012-03-14
| | | | | | | | | | | | | | | | | | | | on a cluster" signal instead of 0. This avoids problems where avio_tell() returns 0. I've updated all the checks against cluster_pos Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc/general: update supported devices table. doc/general: add missing @tab to codecs table. h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. avconv: reindent avconv: link '-passlogfile' option to libx264 'stats' AVOption. libx264: add 'stats' private option for setting 2pass stats filename. libx264: fix help text for slice-max-size option. http: Clear the auth state on redirects http: Retry auth if it failed due to being stale rtsp: Resend new keepalive commands if they used stale auth rtsp: Retry authentication if failed due to being stale httpauth: Parse the stale field in digest auth dxva2_vc1: pass the overlap flag to the decoder dxva2_vc1: fix decoding of BI frames FATE: add shorthand to wavpack test dfa: convert to bytestream2 API anm decoder: move buffer allocation from decode_init() to decode_frame() h264: improve parsing of broken AVC SPS Conflicts: ffmpeg.c libavcodec/anm.c libavcodec/dfa.c libavcodec/h264.c libavcodec/h264_direct.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Clear the auth state on redirectsMartin Storsjö2012-03-13
| | | | | | | | | | | | | | Currently we only try continuing with the same auth mechanism as the initial request. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Retry auth if it failed due to being staleMartin Storsjö2012-03-13
| | | | | | | | | | | | | | Allow up to 4 retries for normal requests, where both the proxy and the target server might need to authenticate. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Resend new keepalive commands if they used stale authMartin Storsjö2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | These commands are sent asynchronously, not waiting for the reply. This reply is parsed later by ff_rtsp_tcp_read_packet or udp_read_packet. If the reply indicates that we used stale authentication and need to use a new nonce, resend a new keepalive command immediately. This is the only request sent asynchronously, so currently there's no other command that needs to be resent in the same way. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Retry authentication if failed due to being staleMartin Storsjö2012-03-13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * httpauth: Parse the stale field in digest authMartin Storsjö2012-03-13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pcm-mpeg: convert to bytestream2 API Revert "h264: clear trailing bits in partially parsed NAL units" remove iwmmxt optimizations mimic: do not continue if swap_buf_size is 0 mimic: convert to bytestream2 API frwu: use MKTAG to check marker instead of AV_RL32 txd: port to bytestream2 API c93: convert to bytestream2 API iff: make .long_name more descriptive FATE: add test for cdxl demuxer rtsp: Fix a typo Conflicts: libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/dsputil_iwmmxt_rnd_template.c libavcodec/arm/mpegvideo_iwmmxt.c libavcodec/c93.c libavcodec/txd.c libavutil/arm/cpu.c tests/fate/demux.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * iff: make .long_name more descriptivePaul B Mahol2012-03-12
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Fix a typoMartin Storsjö2012-03-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | cosmetics: fix some typosLou Logan2012-03-13
| | | | | | | | | | | | | | | | | | | | Patch attached. From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001 From: Lou Logan <lou@lrcd.com> Date: Mon, 12 Mar 2012 14:13:44 -0800 Subject: [PATCH] cosmetics: fix some typos Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: Add option overrun_nonfatalAndrey Utkin2012-03-12
| | | | | | | | | | | | Optionize fail/survive on circular buffer overrun Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: remove dead code line (unused result)Andrey Utkin2012-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "flvenc: Remove apparently unneeded AAC check."Michael Niedermayer2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to video_file_format_spec_v10_1.pdf flv stores AAC RAW thanks to Baptiste Coudurier for pointing that out thanks to Aℓex Converse for explaining: This can't be at the start of a non-ADTS payload. 111 is the EndOfFrame syntax element. Together these proof that the check was correctly rejecting ADTS which is not supposed to be in flv. Many players are able to play such ADTS in flv though but its better if we conform to the spec as this should ensure that not many but all players can play files generated by ffmpeg. This reverts commit 3c9a86df0e20dd1c90a9b390a6555b22f87aa8cd.
* | Revert "udp: add multicast input interface selection"Michael Niedermayer2012-03-12
| | | | | | | | | | | | This reverts commit 9abd47fe90a592822b326345726626a018641d04. Broke compilation on openbsd and others
* | libavformat.v: add ffio_set_buf_size() for ffserver.Michael Niedermayer2012-03-12
| | | | | | | | | | | | its inevitable with the current API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: add multicast input interface selectionTudor.Suciu2012-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvenc: Remove apparently unneeded AAC check.C Chatterjee2012-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix frame height vs field height confusion in MXF decoding.Joseph Artsimovich2012-03-11
| | | | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: add timecode to metadataMatthieu Bouron2012-03-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpjpeg: video streaming will no longer break and stop on FirefoxZalewa PL2012-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | mpjpeg video streamings would break and stop on Firefox after 1 - 30 seconds. In order to fix this, two changes were made: 1. Replaced all occurrences of '\n' character in mjpeg metadata with occurences of "\r\n". 2. Added "Content-length: <packet-size>" metadata entry for each sent frame. The change has been tested on Google Chrome 17.0.963.78 and Firefox 10.0.2 on lubuntu 11.10 and the streaming seems to work fine now.
* | mxf: Add DNxHD ULTomas Härdin2012-03-10
| | | | | | | | | | | | | | Note that the old DNxHD UL is actually JPEG 2000 according to RP224. Leaving it as-is for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | DV demuxer: Stricter check for avio_read result.Reimar Döffinger2012-03-10
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix a bunch of common typos. build: Skip compiling xvmc.h under the correct condition. configure: darwin: Change dylib install names to include major version. mpegts: Always honor a registration descriptor if present and there is no other codec information. aacdec: Fix SCE parity check. aacdec: Fix out of array writes (stack). rtsp: Only set the ttl parameter if the server actually gave a value udp: Set ttl for read-write streams, too, not only for write-only ones udp: Only bind to the multicast address if in read-only mode udp: Clarify the comment about binding the multicast address udp: Reorder comments Conflicts: libavcodec/aacdec.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix a bunch of common typos.Diego Biurrun2012-03-09
| |
| * mpegts: Always honor a registration descriptor if present and there is no ↵Alex Converse2012-03-09
| | | | | | | | other codec information.
| * rtsp: Only set the ttl parameter if the server actually gave a valueMartin Storsjö2012-03-09
| | | | | | | | | | | | | | Passing ttl=0 to the rtp/udp url contexts makes packets never leave the host machine. Signed-off-by: Martin Storsjö <martin@martin.st>
| * udp: Set ttl for read-write streams, too, not only for write-only onesMartin Storsjö2012-03-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * udp: Only bind to the multicast address if in read-only modeMartin Storsjö2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes sending back RTCP RR packets if receiving RTP over multicast. If the multicast stream is sent on demand (set up and signalled via RTSP), the sender might depend on getting RTCP RR packets knowing that there are listeners, otherwise the stream can be closed after a certain timeout. This fixes receiving RTSP streams over multicast on unix, from certain Axis cameras. Signed-off-by: Martin Storsjö <martin@martin.st>