• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7432bcfe
    Michael Niedermayer authored
    * qatar/master:
      vsrc_buffer: fix check from 7ae7c414.
      libxvid: Reorder functions to avoid forward declarations; make functions static.
      libxvid: drop some pointless dead code
      wmal: vertical alignment cosmetics
      wmal: Warn about missing bitstream splicing feature and ask for sample.
      wmal: Skip seekable_frame_in_packet.
      wmal: Drop unused variable num_possible_block_size.
      avfiltergraph: make the AVFilterInOut alloc/free API public
      graphparser: allow specifying sws flags in the graph description.
      graphparser: fix the order of connecting unlabeled links.
      graphparser: add avfilter_graph_parse2().
      vsrc_buffer: allow using a NULL buffer to signal EOF.
      swscale: handle last pixel if lines have an odd width.
      qdm2: fix a dubious pointer cast
      WMAL: Do not try to read rawpcm coefficients if bits is invalid
      mov: Fix detecting there is no sync sample.
      tiffdec: K&R cosmetics
      avf: has_duration does not check the global one
      dsputil: fix optimized emu_edge function on Win64.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/libxvid_rc.c
    	libavcodec/libxvidff.c
    	libavcodec/tiff.c
    	libavcodec/wmalosslessdec.c
    	libavfilter/avfiltergraph.h
    	libavfilter/graphparser.c
    	libavfilter/version.h
    	libavfilter/vsrc_buffer.c
    	libswscale/output.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7432bcfe
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-mt-authorship.txt 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...
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...
libavfilter.texi Loading commit data...
metadata.texi 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...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...