• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9f088a1e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9f088a1e
Name
Last commit
Last update
..
doxy Loading commit data...
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
errno.txt Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filter_design.txt Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
metadata.texi Loading commit data...
mips.txt Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
print_options.c Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
syntax.texi Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...