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
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
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
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
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
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
e2b8b4caf6
avformat/apngdec: validate frame dimensions.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-11-26 23:51:07 +01:00
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
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
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
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
3bedd72a9e
lavf: fix apngdec under msvc.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-11-22 13:20:34 +01:00
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
5d37d70b0b
avformat/apngdec: add APNG demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-11-21 17:13:56 +01:00
