• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c7b9eab2
    Michael Niedermayer authored
    * qatar/master:
      rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time
      rtmp: Set the client buffer time to 3s instead of 0.26s
      rtmp: Handle server bandwidth packets
      rtmp: Display a verbose message when an unknown packet type is received
      lavfi/audio: use av_samples_copy() instead of custom code.
      configure: add all filters hardcoded into avconv to avconv_deps
      avfiltergraph: remove a redundant call to avfilter_get_by_name().
      lavfi: allow building without swscale.
      build: Do not delete tests/vsynth2 directory, which is no longer created.
      lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs
      lavfi: make AVFilterPad opaque after two major bumps.
      lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name().
      lavfi: make avfilter_get_video_buffer() private on next bump.
      jack: update to new latency range API as the old one has been deprecated
      rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r
      ppc: Rename H.264 optimization template file for consistency.
      lavfi: add channelsplit audio filter.
      golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls()
      sws: fix planar RGB input conversions for 9/10/16 bpp.
    
    Conflicts:
    	Changelog
    	configure
    	doc/APIchanges
    	ffmpeg.c
    	libavcodec/golomb.h
    	libavcodec/v210dec.h
    	libavfilter/Makefile
    	libavfilter/allfilters.c
    	libavfilter/asrc_anullsrc.c
    	libavfilter/audio.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/avfiltergraph.c
    	libavfilter/buffersrc.c
    	libavfilter/formats.c
    	libavfilter/version.h
    	libavfilter/vf_frei0r.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavfilter/video.h
    	libavfilter/vsrc_color.c
    	libavformat/rtmpproto.c
    	libswscale/input.c
    	tests/Makefile
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c7b9eab2
v210dec.h 1.14 KB