summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* asfdec: fix assert failure on invalid filesUoti Urpala2011-05-121-0/+4
| | | | | | Add an extra size validity check in asf_read_frame_header(). Without this asf->packet_size_left may become negative, which triggers an assertion failure later.
* Revert "asfdec: fix assert failure on invalid files"Michael Niedermayer2011-05-121-4/+0
| | | | | | Reverting this pulled change as author considers this change buggy compared to his original version. This reverts commit 0bd433a916cd8d98fce47742fbf6d0f90ec941c4.
* If a MP3 file contains the string NSVs, the NSV probe will think it is a NSV ↵Thierry Foucu2011-05-121-3/+17
| | | | | | file instead of a MP3 file. Check for 0xBEEF after a Video/Audio chunck for more accuracy. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-124-1/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) 10-bit H.264 x86 chroma v loopfilter asm Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected] Fix crash of interlaced MPEG2 decoding h264pred: fix one more aliasing violation. doc/APIchanges: fill in missing hashes and dates. flacenc: use proper initializers for AVOption default values. lavc: deprecate named constants for deprecated antialias_algo. aac: workaround for compilation on cygwin swscale: extend YUV422p support to 10bits depth tiff: add support for inverted FillOrder for uncompressed data Remove unused softfloat implementation. h264pred: fix aliasing violations. rotozoom: Eliminate French variable name. rotozoom: Check return value of fread(). rotozoom: Return an error value instead of calling exit(). rotozoom: Make init_demo() return int and check for errors on invocation. rotozoom: Drop silly UINT8 typedef. rotozoom: Drop some unnecessary parentheses. rotozoom: K&R coding style cosmetics rtsp: Only do keepalive using GET_PARAMETER if the server supports it ... Conflicts: Changelog cmdutils.c doc/APIchanges doc/general.texi ffmpeg.c ffplay.c libavcodec/h264pred_template.c libavcodec/resample.c libavutil/pixfmt.h libavutil/softfloat.c libavutil/softfloat.h tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Port SMPTE S302M audio decoder from FFmbc 0.3.Baptiste Coudurier2011-05-111-0/+1
| |
| * rtsp: Only do keepalive using GET_PARAMETER if the server supports itMartin Storsjö2011-05-113-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more like what VLC does. If the server doesn't mention supporting GET_PARAMETER in response to an OPTIONS request, VLC doesn't send any keepalive requests at all. After this patch, libavformat will still send OPTIONS keepalives if GET_PARAMETER isn't explicitly said to be supported. Some RTSP cameras don't support GET_PARAMETER, and will close the connection if this is sent as keepalive request (but support OPTIONS just fine, but probably don't need any keepalive at all). Some other cameras don't support using OPTIONS as keepalive, but require GET_PARAMETER instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/utils: Only consider dvb teletext timestamps for start time when ↵Michael Niedermayer2011-05-121-1/+8
| | | | | | | | | | | | | | they are consistent with the rest. This fixes Ticket51. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add "DAVC" FourCCami_stuff2011-05-111-0/+1
| | | | | | | | | | | | This FourCC is used by "mpegable AVC" codec and the file encoded with this codec decodes correctly with FFmpeg's H264 decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-111-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (30 commits) AVOptions: make default_val a union, as proposed in AVOption2. arm/h264pred: add missing argument type. h264dsp_mmx: place bracket outside #if/#endif block. lavf/utils: fix ff_interleave_compare_dts corner case. fate: add 10-bit H264 tests. h264: do not print "too many references" warning for intra-only. Enable decoding of high bit depth h264. Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. Add support for higher QP values in h264. Add the notion of pixel size in h264 related functions. Make the h264 loop filter bit depth aware. Template dsputil_template.c with respect to pixel size, etc. Template h264idct_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Move some functions in dsputil.c into a new file dsputil_template.c. Move the functions in h264idct into a new file h264idct_template.c. Move the functions in h264pred.c into a new file h264pred_template.c. Preparatory patch for high bit depth h264 decoding support. Add pixel formats for 9- and 10-bit yuv420p. Choose h264 chroma dc dequant function dynamically. ... Conflicts: doc/APIchanges ffmpeg.c ffplay.c libavcodec/alpha/dsputil_alpha.c libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/arm/dsputil_init_neon.c libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/h264pred_init_arm.c libavcodec/bfin/dsputil_bfin.c libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264dsp.c libavcodec/h264idct.c libavcodec/h264pred.c libavcodec/mlib/dsputil_mlib.c libavcodec/options.c libavcodec/ppc/dsputil_altivec.c libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/h264_altivec.c libavcodec/ps2/dsputil_mmi.c libavcodec/sh4/dsputil_align.c libavcodec/sh4/dsputil_sh4.c libavcodec/sparc/dsputil_vis.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/options.c libavformat/utils.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_template.c tests/ref/seek/lavf_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: make default_val a union, as proposed in AVOption2.Anton Khirnov2011-05-105-28/+28
| | | | | | | | This breaks API and ABI.
| * lavf/utils: fix ff_interleave_compare_dts corner case.Vitor Sessak2011-05-101-5/+5
| | | | | | | | | | | | | | | | | | | | This should fix behavior introduced by commit 96573c0d7605672d69b42ae1dcf18764ce47c71a. Av_rescale_rnd() is not lossless so if two timestamps are equal after being rescaled they are not always actually identical. This patch use av_compare_ts() to get always a correct result. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Added oggpagesize option for Ogg encoding. Allows setting a preferred page ↵Andres Gonzalez2011-05-101-2/+23
| | | | | | | | size. When set, if an Ogg stream buffer has enough data, a page is made, instead of filling maximum-size pages.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-103-10/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegaudiodec: group #includes more sanely mpegaudio: remove #if 0 blocks ffmpeg.c: reset avoptions after each input/output file. ffmpeg.c: store per-output stream sws flags. mpegaudio: remove CONFIG_MPEGAUDIO_HP option mpegtsenc: Clear st->priv_data when freeing it udp: Fix receiving RTP data over multicast rtpproto: Remove an unused variable regtest: fix wma tests NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT regtest: separate flags for encoding and decoding Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegtsenc: Clear st->priv_data when freeing itMartin Storsjö2011-05-091-1/+1
| | | | | | | | | | | | If not cleared, the caller might try to free it. Signed-off-by: Martin Storsjö <martin@martin.st>
| * udp: Fix receiving RTP data over multicastMartin Storsjö2011-05-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, AVIO_RDWR was handled as READ, and all the checks for the AVIO_WRONLY flag explicitly meant the write-only case. When changed from old AVIO/URL contants to AVIO_FLAG in 59d96941f0285a5, these comparisons were updated incorrectly, by mapping checks for AVIO_WRONLY to checks for AVIO_FLAG_WRITE. When receiving RTP over UDP, the urlcontext is opened with READ_WRITE flags. This patch updates the flag comparisons to check for the same conditions as the code did prior to 59d96941f0285a5. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpproto: Remove an unused variableMartin Storsjö2011-05-091-3/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | seeking: Favor pkt->pos for generic index building where possible.Michael Niedermayer2011-05-101-1/+2
| | | | | | | | | | See [FFmpeg-devel] [PATCH] Only using st->parser->pos when doing?repacking in the parser. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avienc: Update 2 debug statements to match the current code.Michael Niedermayer2011-05-091-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264probe: update to latest spec.Michael Niedermayer2011-05-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtvdec: Avoid gmtime_r() it breaks compile on windows.Michael Niedermayer2011-05-091-3/+3
| | | | | | | | | | Better solutions welcome, this is just a quick fix to unbreak compile. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtv: calculate ole date correctly (is seconds since 1899-12-30)Peter Ross2011-05-091-1/+1
| |
* | wtv: detect ole date overflowPeter Ross2011-05-091-5/+13
| |
* | Remove unused variable.Reimar Döffinger2011-05-071-2/+0
| |
* | Replace deprecated url_fseek by avio_seek.Reimar Döffinger2011-05-071-1/+1
| |
* | Move ifdef to avoid unused variable warnings.Reimar Döffinger2011-05-071-1/+1
| |
* | Remove unused variables.Reimar Döffinger2011-05-071-3/+3
| |
* | Fix printf format string, fixes a warning.Reimar Döffinger2011-05-071-1/+1
| |
* | riffenc/ffmpeg: Fix stream copyMichael Niedermayer2011-05-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Increase TS packet size detection buffer.Reimar Döffinger2011-05-071-1/+1
| | | | | | | | Fixes warning message with ticket #68.
* | Assume some TS packet size instead of failing completely.Reimar Döffinger2011-05-071-2/+4
| | | | | | | | Fixes ticket #68.
* | oggdec:Correct durationjan gerber2011-05-071-0/+12
| | | | | | | | | | Based on a patch by Reimar Döffinger. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Simplify condition.Reimar Döffinger2011-05-071-1/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-071-13/+27
|\ \ | |/ | | | | | | | | * qatar/master: mov: fix composition timestamps on movie fragments. wmavoice: Use proper size in memeset().
| * mov: fix composition timestamps on movie fragments.Yusuke Nakamura2011-05-051-13/+27
| | | | | | | | This fixes, for instance, the case that there is a track that has some samples with composition time offset and has a track run without sample-composition-time-offsets-present.
* | mp3enc:simplifyMichael Niedermayer2011-05-071-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc:better variable name for the frames field file postion.Michael Niedermayer2011-05-071-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: drop nested structsMichael Niedermayer2011-05-071-37/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc:use FFMIN()Michael Niedermayer2011-05-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc:Drop unneeded floating point math.Michael Niedermayer2011-05-071-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: drop sum and count bytes instead of bitrates from decoded headers.Michael Niedermayer2011-05-071-9/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: remove unneeded ifdefMichael Niedermayer2011-05-071-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: remove unneeded static const variables.Michael Niedermayer2011-05-071-8/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: mux a XING headerPeter Belkner2011-05-071-3/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch below provides exactly that to the MP3 muxer. A XING header containing * the numer of frames, * the size, and * a TOC is generated. It's based on an idea by Anton Khirnov (restricted to the number of frames) found at http://patches.ffmpeg.org/patch/1891/ The TOC is generated as found in lame's "VbrTag.c". According to my tests the following reproduces the number of frames, the size and the TOC in "c.mp3" from "b.mp3" (except a shift due to shorter XING header generated by FFmpeg): lame -V2 a.wav b.mp3 ffmpeg -i b.mp3 -acodec copy -y c.mp3
* | aiffdec:Rewrite get_meta()Michael Niedermayer2011-05-061-11/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: correct frame_offset for seekingMichael Niedermayer2011-05-061-1/+17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: detect mpeg4 keyframes in indexless aviMichael Niedermayer2011-05-061-0/+17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-057-20/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix standalone compilation of pipe protocol.Diego Biurrun2011-05-041-13/+13
| | | | | | | | file_check() is not only used by the file protocol, adjust #ifdef accordingly.
| * Fix standalone compilation of WTV demuxer.Diego Biurrun2011-05-041-1/+2
| |
| * matroskaenc: fix memory leakMans Rullgard2011-05-041-2/+2
| | | | | | | | | | | | | | This fixes a memory leak occurring when no cue points are defined since commit 91819763. Signed-off-by: Mans Rullgard <mans@mansr.com>
View Lorry Controller Status