• 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
libxvid_rc.c 5.27 KB