• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a6186f3a
    Michael Niedermayer authored
    * qatar/master:
      movenc: fix NULL reference in mov_write_tkhd_tag
      rmdec: Reject invalid deinterleaving parameters
      rv34: Fix potential overreads
      rv34: Fix buffer size used for MC of B frames after a resolution change
      rv34: Avoid NULL dereference on corrupted bitstream
      rv10: Reject slices that does not have the same type as the first one
      vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag
      vsrc_color: set output pos values to -1
      vsrc_color: add @file doxy
      vsrc_buffer: remove duplicated file description
      eval: implement not() expression
      eval: add sqrt function for computing the square root
      rmdec: use the deinterleaving mode and not the codec when creating audio packets.
      lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
    
    Conflicts:
    	doc/eval.texi
    	doc/filters.texi
    	libavcodec/rv10.c
    	libavfilter/vsrc_color.c
    	libavformat/rmdec.c
    	libavutil/avutil.h
    	libavutil/eval.c
    	tests/ref/fate/eval
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a6186f3a
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
avconv.c Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...