• 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
ffprobe.c 58.4 KB