virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
97,166 Commits 37 Branches 400 Tags 460 MiB
550fa277ef
Commit Graph

27 Commits

Author SHA1 Message Date
Andreas Rheinhardt
c1d300f83a avformat/apngdec: Don't free extradata manually 
The extradata will be freed automatically when the corresponding stream
gets freed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-12 19:25:33 +01:00
Andreas Rheinhardt
2e328a8a38 avformat/apngdec: Make sure that extradata is zero-padded 
Zeroing the padding has been forgotten.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-12 19:25:33 +01:00
Carl Eugen Hoyos
4d8875ec23 lavf: Constify the probe function argument. 
Reviewed-by: Lauri Kasanen
Reviewed-by: Tomas Härdin
 2019-03-21 11:42:17 +01:00
Carl Eugen Hoyos
5ff080fdfa lavf/apngdec: Return EOF for incomplete files. 
Fixes ticket #7536.
 2018-11-08 13:38:08 +01:00
Marton Balint
06a8d7ff00 avformat/apngdec: set pts to AV_NOPTS_VALUE 
And let the generic code figure out the proper PTS. This is needed because apng
does not provide seek functions, but after a generic seek (e.g. to file start)
timestamps are not reset which causes broken timestamps when looping apngs,
like in ticket #6121.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2018-07-02 11:58:08 +02:00
Clément Bœsch
549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch
cd4d6cba12 lavf: fix usages of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
James Almer
7bfbb72299 avformat/apng: set max_fps to no limit by default 
Should fix ticket #6252

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-21 19:15:19 -03:00
James Almer
874eb012f7 avformat/apng: fix setting frame delay when max_fps is set to no limit 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-21 19:15:12 -03:00
James Almer
16c429166d Revert "apngdec: use side data to pass extradata to the decoder" 
This reverts commit e0c6b32046.

Said commit changed the behavior of the demuxer and decoder in a non
backwards compatible way.
Demuxers should make extradata available at init if possible, and send
new extradata as side data within a packet if needed.

A better fix for the remuxing crash will follow.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-11-18 12:24:28 -03:00
Andreas Cadhalpun
e0c6b32046 apngdec: use side data to pass extradata to the decoder 
Fixes remuxing apng streams coming from the apng demuxer.
This is a regression since 940b8908b9.

Found-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-01 18:49:28 +01:00
Derek Buitenhuis
6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00
Clément Bœsch
43ecec0f03 avformat: use AV_OPT_TYPE_BOOL in a bunch of places 2015-12-04 15:43:33 +01:00
Michael Niedermayer
29d147c94d Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/4xm.c
	libavcodec/aac_adtstoasc_bsf.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.h
	libavcodec/asvenc.c
	libavcodec/avcodec.h
	libavcodec/avpacket.c
	libavcodec/dvdec.c
	libavcodec/ffv1enc.c
	libavcodec/g2meet.c
	libavcodec/gif.c
	libavcodec/h264.c
	libavcodec/h264_mp4toannexb_bsf.c
	libavcodec/huffyuvdec.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libxvid.c
	libavcodec/mdec.c
	libavcodec/motionpixels.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/noise_bsf.c
	libavcodec/nuv.c
	libavcodec/nvenc.c
	libavcodec/options.c
	libavcodec/parser.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/qsvdec.c
	libavcodec/svq1enc.c
	libavcodec/tiffenc.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/vc1dec.c
	libavcodec/wmalosslessdec.c
	libavformat/adxdec.c
	libavformat/aiffdec.c
	libavformat/apc.c
	libavformat/apetag.c
	libavformat/avidec.c
	libavformat/bink.c
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/id3v2.c
	libavformat/isom.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mpc.c
	libavformat/mpc8.c
	libavformat/mpegts.c
	libavformat/mvi.c
	libavformat/mxfdec.c
	libavformat/mxg.c
	libavformat/nutdec.c
	libavformat/oggdec.c
	libavformat/oggparsecelt.c
	libavformat/oggparseflac.c
	libavformat/oggparseopus.c
	libavformat/oggparsespeex.c
	libavformat/omadec.c
	libavformat/rawdec.c
	libavformat/riffdec.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_qdm2.c
	libavformat/rtpdec_svq3.c
	libavformat/sierravmd.c
	libavformat/smacker.c
	libavformat/smush.c
	libavformat/spdifenc.c
	libavformat/takdec.c
	libavformat/tta.c
	libavformat/utils.c
	libavformat/vqf.c
	libavformat/westwood_vqa.c
	libavformat/xmv.c
	libavformat/xwma.c
	libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 23:15:19 +02:00
Michael Niedermayer
80a851aa5e avformat/apngdec: Use 64bit for ret to avoid overflow 
Missed this hunk in first commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-20 20:39:04 +01:00
Michael Niedermayer
0e3d6e17de avformat/apngdec: Use 64bit ret to avoid overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-20 19:31:10 +01:00
Clément Bœsch
d60fb4f794 avformat/apngdec: make tag_buf string larger 
av_get_codec_tag_string() uses more that 1 char for unprintable characters.
 2014-12-20 00:17:21 +01:00
Benoit Fouet
d7716961a8 avformat/apngdec: exit probing when skipping is not possible. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 16:02:01 +01:00
Benoit Fouet
543fceba9c apng: move shared header from avformat to avcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 15:52:31 +01:00
Benoit Fouet
e2b8b4caf6 avformat/apngdec: validate frame dimensions. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-26 23:51:07 +01:00
Benoit Fouet
8b8cb30d11 avformat/apngdec: use packet pts and duration instead of altering stream framerate. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-26 12:41:56 +01:00
Benoit Fouet
4acefd2521 avformat/apngdec: account for blend and dispose operations. 
When the dimensions are the entire frame ones, and the dispose operation
is to reset to background, or the new frame overwrites the new one, then
consider the frame as a key one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-26 00:59:45 +01:00
Benoit Fouet
9e1cfbd38a avformat/apngdec: transmit all the chunks between consecutive fcTL ones. 
In order to support multiple IDAT of fdAT chunks following an fcTL one,
transmit all the chunks between two fcTL ones (or between fcTL and IEND
one).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-24 21:10:03 +01:00
James Almer
305b03097d lavf/apngdec: print currently unsupported in-stream tags in a more readable form 
Also use length and not stream position

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-23 13:01:26 -03:00
Matthew Oliver
3bedd72a9e lavf: fix apngdec under msvc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 13:20:34 +01:00
James Almer
14b9302f5f lavf/apngdec: properly skip currently unsupported in-stream tags 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 13:14:28 +01:00
Benoit Fouet
5d37d70b0b avformat/apngdec: add APNG demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 17:13:56 +01:00