• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 653d117c
    Michael Niedermayer authored
    * qatar/master:
      libschroedinger: Switch to function names more in line with Libav style.
      Move code shared between libdirac and libschroedinger to libschroedinger.
      lavfi: uninline avfilter_copy_buffer_ref_props().
      lavf: add missing '*' in a doxy.
      h264: Remove a commented-out function pointer typedef.
      txd: Remove write-only variable in txd_decode_frame().
      mmvideo.c: Remove unused variable in mm_decode_pal().
      build: cosmetics: Add missing end-of-line backslashes to item lists.
      build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
      libschroedinger: Move a function to avoid a forward declaration.
      pthread: warn on high thread counts
      vf_yadif: fix missing error handling for avfilter_poll_frame()
      avprobe: allow showing only one container/stream property.
      lavfi: support audio in avfilter_copy_frame_props().
      lavfi: avfilter_merge_formats: handle case where inputs are same
      lavc: add sample rate and channel layout to AVFrame.
      zerocodec: check if the previous frame is missing
      doc: clarify check for NULL pointer style
    
    Conflicts:
    	doc/APIchanges
    	doc/developer.texi
    	ffprobe.c
    	libavcodec/Makefile
    	libavcodec/avcodec.h
    	libavcodec/libdirac_libschro.c
    	libavcodec/libdirac_libschro.h
    	libavcodec/mmvideo.c
    	libavcodec/txd.c
    	libavcodec/version.h
    	libavcodec/zerocodec.c
    	libavfilter/Makefile
    	libavfilter/avfilter.c
    	libavfilter/version.h
    	libavformat/Makefile
    	libavutil/Makefile
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    653d117c
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...