summaryrefslogtreecommitdiffstats
path: root/libavformat/swf.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-181-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swf(dec): replace CODEC_ID with AV_CODEC_IDAnton Khirnov2012-08-181-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-101-0/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: g723.1: fix addition overflow g723.1: simplify and fix multiplication overflow g723.1: deobfuscate an expression g723.1: remove unused #includes ARM: add missing "cc" clobber in av_clipl_int32_arm() rtmp: Factorize the code by adding handle_invoke_error rtmp: Factorize the code by adding handle_invoke_status rtmp: Factorize the code by adding handle_invoke_result libavutil: remove unused av_abort() macro ffmenc: replace if/abort with assert() libavutil: drop offsetof() fallback definition libavutil: drop fallback definitions of INTxx_MIN/MAX configure: Check for a sctp struct instead of just the header configure: suncc: Add -xc99 to dependency flags, required on Solaris doxygen: Fix function parameter names to match the code doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs swf: Move shared table out of the header file swf: Move swf_audio_codec_tags table to the only place it is used fate: add G.723.1 decoder tests Conflicts: configure doc/platform.texi libavformat/Makefile libavutil/arm/intmath.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swf: Move shared table out of the header fileDiego Biurrun2012-08-091-0/+29
|/
* split swf de/muxerBaptiste Coudurier2008-05-201-817/+0
| | | | Originally committed as revision 13203 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-1/+2
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* unset extension, so code path, and guess format do not chooseBaptiste Coudurier2008-01-211-1/+1
| | | | | | | avm2/flash 9 by default, not sure this is adequate though, this fixes regression tests. Originally committed as revision 11588 to svn://svn.ffmpeg.org/ffmpeg/trunk
* new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot comPaul Egan2008-01-201-1/+28
| | | | Originally committed as revision 11574 to svn://svn.ffmpeg.org/ffmpeg/trunk
* check av_new_stream return valueBaptiste Coudurier2008-01-081-0/+6
| | | | Originally committed as revision 11463 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use dynamically allocated ByteIOContext in AVFormatContextBjörn Axelsson2007-11-211-15/+15
| | | | | | | patch by: Björn Axelsson, bjorn d axelsson a intinor d se thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007 Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
* support swink created files which have soi/eoi broken tags reversedBaptiste Coudurier2007-08-201-1/+3
| | | | Originally committed as revision 10152 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove now useless varsBaptiste Coudurier2007-08-051-4/+1
| | | | Originally committed as revision 9928 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics, braces/parenthesis styleBaptiste Coudurier2007-08-051-28/+27
| | | | Originally committed as revision 9927 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics, indentationBaptiste Coudurier2007-08-051-99/+98
| | | | Originally committed as revision 9926 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add streams on the fly, swf is a streaming format and has no real header, ↵Baptiste Coudurier2007-08-051-37/+28
| | | | | | correctly detect audio in RamboMJPEGAVP6_112K.swf now Originally committed as revision 9925 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: misc typo fixesDiego Biurrun2007-07-281-1/+1
| | | | Originally committed as revision 9815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace all occurrences of AVERROR_IO with AVERROR(EIO).Panagiotis Issaris2007-07-191-4/+4
| | | | Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc spelling fixesDiego Biurrun2007-06-121-1/+1
| | | | Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add an enum for need_parsingAurelien Jacobs2007-04-151-1/+1
| | | | Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* allocate 32 extra bytes at the end of the probe buffer and remove most probe ↵Michael Niedermayer2007-04-081-2/+0
| | | | | | buf_size checks Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
* seems safer to set pts timebase to sample rate, fix some mp3Baptiste Coudurier2007-03-081-1/+1
| | | | Originally committed as revision 8300 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix pts handlingBaptiste Coudurier2007-03-081-16/+7
| | | | Originally committed as revision 8299 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l, audio_fifo is a static arrayAlex Beregszaszi2007-03-061-1/+0
| | | | Originally committed as revision 8273 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use AVFormatContext with av_logBaptiste Coudurier2007-03-051-2/+2
| | | | Originally committed as revision 8245 to svn://svn.ffmpeg.org/ffmpeg/trunk
* more explicit messageBaptiste Coudurier2007-03-051-2/+2
| | | | Originally committed as revision 8243 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cleanup useless fieldsBaptiste Coudurier2007-03-041-8/+0
| | | | Originally committed as revision 8224 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify swf muxerBaptiste Coudurier2007-03-041-136/+26
| | | | Originally committed as revision 8223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* support for adpcm swf, pcmBaptiste Coudurier2007-03-021-4/+14
| | | | Originally committed as revision 8189 to svn://svn.ffmpeg.org/ffmpeg/trunk
* don't parse whole swf file in header, can now play ffserver swf streamsBaptiste Coudurier2007-03-011-9/+6
| | | | Originally committed as revision 8176 to svn://svn.ffmpeg.org/ffmpeg/trunk
* factorizeBaptiste Coudurier2007-03-011-10/+7
| | | | Originally committed as revision 8175 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove nonsense time base code, use swf ms per frame, only video frames ↵Baptiste Coudurier2007-03-011-8/+3
| | | | | | contains pts Originally committed as revision 8174 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use AV_RB32, swf_mp3_info may be replaced with mpa_decoder_headerAlex Beregszaszi2007-02-251-2/+1
| | | | Originally committed as revision 8123 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add codec_id <-> codec_tag tables to AVIn/OutputFormatMichael Niedermayer2007-01-211-1/+1
| | | | Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename BE/LE_8/16/32 to AV_RL/B_8/16/32Alex Beregszaszi2007-01-191-1/+1
| | | | Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
* seek back at the end of file after updating headerBaptiste Coudurier2007-01-141-0/+1
| | | | Originally committed as revision 7473 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplifyBaptiste Coudurier2007-01-141-13/+4
| | | | Originally committed as revision 7465 to svn://svn.ffmpeg.org/ffmpeg/trunk
* priv_data is allocated internallyBaptiste Coudurier2007-01-141-6/+1
| | | | Originally committed as revision 7459 to svn://svn.ffmpeg.org/ffmpeg/trunk
* enable mjpeg in swfBaptiste Coudurier2007-01-141-0/+28
| | | | Originally committed as revision 7458 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplifyBaptiste Coudurier2007-01-141-5/+3
| | | | Originally committed as revision 7457 to svn://svn.ffmpeg.org/ffmpeg/trunk
* swf can contain only one audio track, simplifyBaptiste Coudurier2007-01-141-10/+9
| | | | Originally committed as revision 7456 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use ch_id as AVStream id and simplifyBaptiste Coudurier2007-01-141-17/+10
| | | | Originally committed as revision 7455 to svn://svn.ffmpeg.org/ffmpeg/trunk
* always export audiostreamsBaptiste Coudurier2007-01-141-27/+22
| | | | Originally committed as revision 7454 to svn://svn.ffmpeg.org/ffmpeg/trunk
* always export videostreamsBaptiste Coudurier2007-01-141-12/+7
| | | | Originally committed as revision 7452 to svn://svn.ffmpeg.org/ffmpeg/trunk
* priv_data is allocated/freed internallyBaptiste Coudurier2007-01-081-7/+1
| | | | Originally committed as revision 7426 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplifyBaptiste Coudurier2007-01-051-4/+1
| | | | Originally committed as revision 7409 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dont skip too many bytes if tag is TAG_STREAMHEAD2 and mp3Baptiste Coudurier2007-01-051-4/+1
| | | | Originally committed as revision 7408 to svn://svn.ffmpeg.org/ffmpeg/trunk
* print error when unsupported sample rate is used with swfBaptiste Coudurier2006-11-161-0/+1
| | | | Originally committed as revision 7101 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix mp3 in swf decodingAurelien Jacobs2006-10-251-1/+3
| | | | Originally committed as revision 6792 to svn://svn.ffmpeg.org/ffmpeg/trunk
* don't use ast before checking it's not NULLAurelien Jacobs2006-10-221-1/+1
| | | | Originally committed as revision 6771 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud