summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-132-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-121-1/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Fix a typoMartin Storsjö2012-03-121-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | cosmetics: fix some typosLou Logan2012-03-133-3/+3
| | | | | | | | | | | | | | | | | | | | 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-121-6/+23
| | | | | | | | | | | | 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-121-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "flvenc: Remove apparently unneeded AAC check."Michael Niedermayer2012-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-28/+2
| | | | | | | | | | | | This reverts commit 9abd47fe90a592822b326345726626a018641d04. Broke compilation on openbsd and others
* | libavformat.v: add ffio_set_buf_size() for ffserver.Michael Niedermayer2012-03-121-0/+1
| | | | | | | | | | | | its inevitable with the current API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: add multicast input interface selectionTudor.Suciu2012-03-121-2/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvenc: Remove apparently unneeded AAC check.C Chatterjee2012-03-121-4/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix frame height vs field height confusion in MXF decoding.Joseph Artsimovich2012-03-112-2/+33
| | | | | | | | | | | | 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-111-1/+60
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpjpeg: video streaming will no longer break and stop on FirefoxZalewa PL2012-03-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+1
| | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-104-10/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-091-1/+1
| |
| * mpegts: Always honor a registration descriptor if present and there is no ↵Alex Converse2012-03-091-2/+1
| | | | | | | | other codec information.
| * rtsp: Only set the ttl parameter if the server actually gave a valueMartin Storsjö2012-03-091-2/+4
| | | | | | | | | | | | | | 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-091-2/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * udp: Only bind to the multicast address if in read-only modeMartin Storsjö2012-03-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * udp: Clarify the comment about binding the multicast addressMartin Storsjö2012-03-091-1/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * udp: Reorder commentsMartin Storsjö2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | When this code was added in 36b532815cb83, the new code was added between the existing comment and the existing line of code, making the old comment seem to refer to the new code. This makes it read correctly. Signed-off-by: Martin Storsjö <martin@martin.st>
* | mpegvideo_probe: Fix misdetection of mpeg4video files.Michael Niedermayer2012-03-091-2/+4
| | | | | | | | | | | | (issue1210) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Add system to seperate relative timestamps from absolute ones.Michael Niedermayer2012-03-091-17/+39
| | | | | | | | | | | | | | | | | | With this we can always know if a timestamp is based on added durations from an unknown origin or if it is based on a correct timestamp (and possibly added durations) This should fix some bugs where this distinction was mixed up. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Cosmetics: Remove superfluous newline.Carl Eugen Hoyos2012-03-091-1/+1
| |
* | iff: add support for IFF DEEPPiotr Bandurski2012-03-091-1/+43
| | | | | | | | | | | | | | | | | | Fixes trac #1045. Thanks to Peter Ross for his help with this patch. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-092-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ttadec: unbreak playback of matroska files vorbisdec: avoid invalid memory access Fix uninitialized reads on malformed ogg files. huffyuv: add padding to classic (v1) huffman tables. png: convert to bytestream2 API. dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2 avs: fix infinite loop on end-of-stream. tiffdec: Prevent illegal memory access caused by recycled pointers. rtpenc: Fix the AVRational used for av_rescale_q_rnd wma: fix off-by-one in array bounds check. Conflicts: libavcodec/huffyuv.c libavcodec/pngdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix uninitialized reads on malformed ogg files.Dale Curtis2012-03-081-5/+5
| | | | | | | | | | | | | | | | | | | | The ogg decoder wasn't padding the input buffer with the appropriate FF_INPUT_BUFFER_PADDING_SIZE bytes. Which led to uninitialized reads in various pieces of parsing code when they thought they had more data than they actually did. Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * rtpenc: Fix the AVRational used for av_rescale_q_rndMartin Storsjö2012-03-081-1/+1
| | | | | | | | | | | | | | The current one has a zero denominator - this is what was intended in 14aecc50fae6. Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggparseogm: Fix order or arguments.Michael Niedermayer2012-03-081-1/+1
| | | | | | | | | | | | Bug introduced by libav in 1bb3990b560e7ff7f46c06c14f959fe432e0b625 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: Discard invalid CTTS.Michael Niedermayer2012-03-081-0/+8
| | | | | | | | | | | | Fixes Ticket385 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-082-2/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) sbrdsp.asm: convert all instructions to float/SSE ones. dv: cosmetics. dv: check buffer size before reading profile. Revert "AAC SBR: group some writes." udp: Print an error message if bind fails cook: extend channel uncoupling tables so the full bit range is covered. roqvideo: cosmetics. roqvideo: convert to bytestream2 API. dca: don't use av_clip_uintp2(). wmall: fix build with -DDEBUG enabled. smc: port to bytestream2 API. AAC SBR: group some writes. dsputil: remove shift parameter from scalarproduct_int16 SBR DSP: unroll sum_square rv34: remove dead code in intra availability check rv34: clean a bit availability checks. v4l2: update documentation tgq: convert to bytestream2 API. parser: remove forward declaration of MpegEncContext dca: prevent accessing static arrays with invalid indexes. ... Conflicts: doc/indevs.texi libavcodec/Makefile libavcodec/dca.c libavcodec/dvdata.c libavcodec/eatgq.c libavcodec/mmvideo.c libavcodec/roqvideodec.c libavcodec/smc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Print an error message if bind failsMartin Storsjö2012-03-071-1/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * smacker: error out if palette copy-with-offset overruns palette size.Ronald S. Bultje2012-03-071-1/+8
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * mov: Allow last chunk to have an arbitrary number of samples.Carl Eugen Hoyos2012-03-061-1/+2
| | | | | | | | | | | | | | Fixes ticket #673. (cherry picked from commit 8dcd2a41ecff8cc1e9b20cc267df54c59878ab3b) Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | avformat_new_stream: fix initial last_dts valueMichael Niedermayer2012-03-081-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Add intra_only flag to MXFTrackTomas Härdin2012-03-081-0/+23
| | | | | | | | | | | | This allows future assumptions to be made without affecting non-intra files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Fix Avid AirSpeed files being misinterpreted as OP1aTomas Härdin2012-03-081-3/+8
| | | | | | | | | | | | | | | | The "ECs != 1 -> OP1a" assumption was wrong. Luckily, the file that triggered that behavior had two ECs, not zero. Hence distinguishing between them is simple in this case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Truncate packets that extend past the next edit unitTomas Härdin2012-03-081-14/+41
| | | | | | | | | | | | | | This fixes rare cases where OPAtom may be treated as OP1a, causing all essence to be read into RAM. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-0614-321/+362
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) cdxl demux: do not create packets with uninitialized data at EOF. Replace computations of remaining bits with calls to get_bits_left(). amrnb/amrwb: Remove get_bits usage. cosmetics: reindent avformat: do not require a pixel/sample format if there is no decoder avformat: do not fill-in audio packet duration in compute_pkt_fields() lavf: Use av_get_audio_frame_duration() in get_audio_frame_size() dca_parser: parse the sample rate and frame durations libspeexdec: do not set AVCodecContext.frame_size libopencore-amr: do not set AVCodecContext.frame_size alsdec: do not set AVCodecContext.frame_size siff: do not set AVCodecContext.frame_size amr demuxer: do not set AVCodecContext.frame_size. aiffdec: do not set AVCodecContext.frame_size mov: do not set AVCodecContext.frame_size ape: do not set AVCodecContext.frame_size. rdt: remove workaround for infinite loop with aac avformat: do not require frame_size in avformat_find_stream_info() for CELT avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3 avformat: do not require frame_size in avformat_find_stream_info() for AAC ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/h264.c libavcodec/h264_ps.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdxl demux: do not create packets with uninitialized data at EOF.Reimar Döffinger2012-03-051-0/+1
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * cosmetics: reindentJustin Ruggles2012-03-051-5/+5
| |
| * avformat: do not require a pixel/sample format if there is no decoderJustin Ruggles2012-03-052-13/+30
| | | | | | | | | | | | | | | | Also, do not keep trying to find and open a decoder in try_decode_frame() if we already tried and failed once. Fixes always searching until max_analyze_duration in avformat_find_stream_info() when demuxing codecs without a decoder.
| * avformat: do not fill-in audio packet duration in compute_pkt_fields()Justin Ruggles2012-03-051-14/+33
| | | | | | | | Use the estimated duration only to calculate missing timestamps if needed.
| * lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()Justin Ruggles2012-03-051-19/+14
| | | | | | | | | | | | | | | | | | | | Also, do not give AVCodecContext.frame_size priority for muxing. Updated 2 FATE references: dxa-feeble - adds 1 audio frame that is still within 2 seconds as specified by -t 2 in the FATE test wmv8-drm-nodec - durations are not needed. previously they were estimated using the packet size and average bit rate.
| * siff: do not set AVCodecContext.frame_sizeJustin Ruggles2012-03-051-3/+5
| | | | | | | | | | also, properly set AVCodecContext.bits_per_coded_sample, AVStreasm.start_time, and AVPacket.duration.
| * amr demuxer: do not set AVCodecContext.frame_size.Justin Ruggles2012-03-051-2/+0
| | | | | | | | it is not necessary.
| * aiffdec: do not set AVCodecContext.frame_sizeJustin Ruggles2012-03-051-12/+18
| | | | | | | | | | | | | | | | | | It is unnecessary. Also, for some codecs we're reading more than 1 frame per packet. Instead we use a private context variable to calculate the bit rate, stream duration, and packet durations. Updated FATE seek test, which has slightly different timestamps due to a more accurate bit rate calculation.
OpenPOWER on IntegriCloud