• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b536e2fa
    Michael Niedermayer authored
    * qatar/master:
      avconv: add an assert to silence an uninitialized variable warning.
      avconv: shut up an uninitialized variable warning.
      avfiltergraph: shut up uninitialized variable warning.
      af_join: initialize a variable to shut up gcc warning.
      amix: fix format specifier for AVFilterLink.sample_rate.
      lavfi: make filters less verbose.
      mpc8: read APE tags.
      lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
      libm: provide fallback definition for cbrtf() using powf()
      network: Don't redefine error codes if they already exist in errno.h
      configure: Check for sys/time.h
      network: Include unistd.h from network.h
      avconv: don't include vsrc_buffer.h, which doesn't exist anymore
      lavfi: reorder AVFilterLink fields.
      lavfi: reorder AVFilterContext fields.
      lavfi: reorder AVFilter fields.
      lavfi: reorder AVFilterBufferRef fields.
      lavfi: reorder AVFilterBuffer fields.
    
    Conflicts:
    	configure
    	libavcodec/v210dec.h
    	libavfilter/asrc_anullsrc.c
    	libavfilter/avfilter.h
    	libavfilter/buffersrc.c
    	libavfilter/src_movie.c
    	libavfilter/vf_aspect.c
    	libavfilter/vf_crop.c
    	libavfilter/vf_drawbox.c
    	libavfilter/vf_fade.c
    	libavfilter/vf_overlay.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavfilter/vsrc_color.c
    	libavformat/network.h
    	libavutil/libm.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b536e2fa
ffmpeg.c 219 KB