mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02:00
a78f6b8cb9
* qatar/master: (38 commits) v210enc: remove redundant check for pix_fmt wavpack: allow user to disable CRC checking v210enc: Use Bytestream2 functions cafdec: Check return value of avio_seek and avoid modifying state if it fails yop: Check return value of avio_seek and avoid modifying state if it fails tta: Check return value of avio_seek and avoid modifying state if it fails tmv: Check return value of avio_seek and avoid modifying state if it fails r3d: Check return value of avio_seek and avoid modifying state if it fails nsvdec: Check return value of avio_seek and avoid modifying state if it fails mpc8: Check return value of avio_seek and avoid modifying state if it fails jvdec: Check return value of avio_seek and avoid modifying state if it fails filmstripdec: Check return value of avio_seek and avoid modifying state if it fails ffmdec: Check return value of avio_seek and avoid modifying state if it fails dv: Check return value of avio_seek and avoid modifying state if it fails bink: Check return value of avio_seek and avoid modifying state if it fails Check AVCodec.pix_fmts in avcodec_open2() svq3: Prevent illegal reads while parsing extradata. remove ParseContext1 vc1: use ff_parse_close mpegvideo parser: move specific fields into private context ... Conflicts: libavcodec/4xm.c libavcodec/aacdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/mpeg4video_parser.c libavcodec/svq3.c libavcodec/v210enc.c libavformat/cafdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
alldevices.c | ||
alsa-audio-common.c | ||
alsa-audio-dec.c | ||
alsa-audio-enc.c | ||
alsa-audio.h | ||
avdevice.c | ||
avdevice.h | ||
bktr.c | ||
dshow_common.c | ||
dshow_enummediatypes.c | ||
dshow_enumpins.c | ||
dshow_filter.c | ||
dshow_pin.c | ||
dshow.c | ||
dshow.h | ||
dv1394.c | ||
dv1394.h | ||
fbdev.c | ||
jack_audio.c | ||
lavfi.c | ||
libavdevice.v | ||
libcdio.c | ||
libdc1394.c | ||
Makefile | ||
openal-dec.c | ||
oss_audio.c | ||
pulse.c | ||
sdl.c | ||
sndio_common.c | ||
sndio_common.h | ||
sndio_dec.c | ||
sndio_enc.c | ||
timefilter.c | ||
timefilter.h | ||
v4l2.c | ||
v4l.c | ||
vfwcap.c | ||
x11grab.c |