daac7f4d9c
avformat/swf: add support for reading and writing VP6A and Flash Screen Video codecs
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2021-01-23 20:10:05 +01:00
6c180b35c4
Merge remote-tracking branch 'qatar/master'
...
* 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>
2012-08-18 15:20:32 +02:00
15c71dfd03
swf(dec): replace CODEC_ID with AV_CODEC_ID
2012-08-18 08:48:30 +02:00
18b0c39f99
Merge remote-tracking branch 'qatar/master'
...
* 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>
2012-08-10 16:25:23 +02:00
90f7e61769
swf: Move shared table out of the header file
2012-08-09 20:05:54 +02:00
3b35f4ab51
split swf de/muxer
...
Originally committed as revision 13203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 23:31:10 +00:00
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
afecbec22b
unset extension, so code path, and guess format do not choose
...
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
2008-01-21 13:43:40 +00:00
dfb400a8ea
new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
...
Originally committed as revision 11574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 18:30:04 +00:00
e55a4dd328
check av_new_stream return value
...
Originally committed as revision 11463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 13:55:15 +00:00
899681cd1d
Use dynamically allocated ByteIOContext in AVFormatContext
...
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
2007-11-21 07:41:00 +00:00
1f794d69c0
support swink created files which have soi/eoi broken tags reversed
...
Originally committed as revision 10152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-20 19:55:37 +00:00
4f0a995631
remove now useless vars
...
Originally committed as revision 9928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 01:40:49 +00:00
5fcf2df323
cosmetics, braces/parenthesis style
...
Originally committed as revision 9927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 01:40:07 +00:00
c78ed54266
cosmetics, indentation
...
Originally committed as revision 9926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 01:36:31 +00:00
c6f05d8122
add streams on the fly, swf is a streaming format and has no real header, correctly detect audio in RamboMJPEGAVP6_112K.swf now
...
Originally committed as revision 9925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 01:28:05 +00:00
df3a80b50a
cosmetics: misc typo fixes
...
Originally committed as revision 9815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 12:46:26 +00:00
6f3e0b2174
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
...
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:23:32 +00:00
755bfeabcc
misc spelling fixes
...
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
57004ff1d7
add an enum for need_parsing
...
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 13:51:57 +00:00
87e8788680
allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks
...
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:34:15 +00:00
dc13d0b5ae
seems safer to set pts timebase to sample rate, fix some mp3
...
Originally committed as revision 8300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 22:14:04 +00:00
b912ef3fc9
fix pts handling
...
Originally committed as revision 8299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 21:29:38 +00:00
73d6ca4fee
10l, audio_fifo is a static array
...
Originally committed as revision 8273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-06 18:19:31 +00:00
5095aaa91c
use AVFormatContext with av_log
...
Originally committed as revision 8245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 10:07:42 +00:00
c544ded699
more explicit message
...
Originally committed as revision 8243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 10:04:34 +00:00
8fafc1cf36
cleanup useless fields
...
Originally committed as revision 8224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 22:41:06 +00:00
013e0a8f35
simplify swf muxer
...
Originally committed as revision 8223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 22:30:25 +00:00
dd8a46d9df
support for adpcm swf, pcm
...
Originally committed as revision 8189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 10:32:08 +00:00
3922c59fc4
don't parse whole swf file in header, can now play ffserver swf streams
...
Originally committed as revision 8176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-01 19:02:21 +00:00
024c7378c3
factorize
...
Originally committed as revision 8175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-01 17:05:11 +00:00
dfc1313d28
remove nonsense time base code, use swf ms per frame, only video frames contains pts
...
Originally committed as revision 8174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-01 16:59:59 +00:00
950d94ad3b
use AV_RB32, swf_mp3_info may be replaced with mpa_decoder_header
...
Originally committed as revision 8123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 14:13:12 +00:00
7caf0cc62c
add codec_id <-> codec_tag tables to AVIn/OutputFormat
...
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 01:39:17 +00:00
fead30d444
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
...
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
3439dc9507
seek back at the end of file after updating header
...
Originally committed as revision 7473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:57:26 +00:00
8f36d4ba4d
simplify
...
Originally committed as revision 7465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 12:47:32 +00:00
2ab573cdc3
priv_data is allocated internally
...
Originally committed as revision 7459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 02:21:28 +00:00
a0dc1ccd29
enable mjpeg in swf
...
Originally committed as revision 7458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:57:43 +00:00
655254f001
simplify
...
Originally committed as revision 7457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:20:24 +00:00
5b1e5dce35
swf can contain only one audio track, simplify
...
Originally committed as revision 7456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:14:31 +00:00
432cef7605
use ch_id as AVStream id and simplify
...
Originally committed as revision 7455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:07:14 +00:00
ec54839ab1
always export audiostreams
...
Originally committed as revision 7454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 00:54:03 +00:00
b4bcf81001
always export videostreams
...
Originally committed as revision 7452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 00:46:37 +00:00
fed7d06796
priv_data is allocated/freed internally
...
Originally committed as revision 7426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 12:33:16 +00:00
e943369fd4
simplify
...
Originally committed as revision 7409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-05 14:23:13 +00:00
17230c9d4d
dont skip too many bytes if tag is TAG_STREAMHEAD2 and mp3
...
Originally committed as revision 7408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-05 14:17:41 +00:00
43a8686416
print error when unsupported sample rate is used with swf
...
Originally committed as revision 7101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 11:19:03 +00:00
21e3c26ca2
fix mp3 in swf decoding
...
Originally committed as revision 6792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-25 20:05:14 +00:00
fa73604f61
don't use ast before checking it's not NULL
...
Originally committed as revision 6771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 23:23:55 +00:00
Marton Balint