mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-04 04:00:46 +00:00
d46c1c72e4
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.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 | ||
caca.c | ||
dshow_capture.h | ||
dshow_common.c | ||
dshow_enummediatypes.c | ||
dshow_enumpins.c | ||
dshow_filter.c | ||
dshow_pin.c | ||
dshow.c | ||
dv1394.c | ||
dv1394.h | ||
fbdev.c | ||
iec61883.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 | ||
version.h | ||
vfwcap.c | ||
x11grab.c |