mirror of https://git.ffmpeg.org/ffmpeg.git
* qatar/master: mpegvideo: reduce excessive inlining of mpeg_motion() mpegvideo: convert mpegvideo_common.h to a .c file build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO Move MASK_ABS macro to libavcodec/mathops.h x86: move MANGLE() and related macros to libavutil/x86/asm.h x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h aacdec: Don't fall back to the old output configuration when no old configuration is present. rtmp: Add message tracking rtsp: Support mpegts in raw udp packets rtsp: Support receiving plain data over UDP without any RTP encapsulation rtpdec: Remove an unused include rtpenc: Remove an av_abort() that depends on user-supplied data vsrc_movie: discourage its use with avconv. avconv: allow no input files. avconv: prevent invalid reads in transcode_init() avconv: rename OutputStream.is_past_recording_time to finished. Conflicts: configure doc/filters.texi ffmpeg.c ffmpeg.h libavcodec/Makefile libavcodec/aacdec.c libavcodec/mpegvideo.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
doxy | ||
examples | ||
APIchanges | ||
Makefile | ||
RELEASE_NOTES | ||
avtools-common-opts.texi | ||
avutil.txt | ||
bitstream_filters.texi | ||
build_system.txt | ||
decoders.texi | ||
demuxers.texi | ||
developer.texi | ||
encoders.texi | ||
errno.txt | ||
eval.texi | ||
faq.texi | ||
fate.texi | ||
ffmpeg.texi | ||
ffmpeg.txt | ||
ffplay.texi | ||
ffprobe.texi | ||
ffprobe.xsd | ||
ffserver.conf | ||
ffserver.texi | ||
filter_design.txt | ||
filters.texi | ||
general.texi | ||
git-howto.texi | ||
git-howto.txt | ||
indevs.texi | ||
issue_tracker.txt | ||
metadata.texi | ||
mips.txt | ||
multithreading.txt | ||
muxers.texi | ||
optimization.txt | ||
outdevs.texi | ||
platform.texi | ||
print_options.c | ||
protocols.texi | ||
rate_distortion.txt | ||
snow.txt | ||
soc.txt | ||
swresample.txt | ||
swscale.txt | ||
syntax.texi | ||
t2h.init | ||
tablegen.txt | ||
texi2pod.pl | ||
viterbi.txt |