• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 484e59a0
    Michael Niedermayer authored
    * qatar/master:
      avs: call release_buffer() at the end.
      Add minor bumps and APIchanges entries for lavc/lavfi changes.
      mpegvideo.c: K&R formatting and cosmetics.
      avconv: avoid memcpy in vsrc_buffer when possible.
      avconv: implement get_buffer()/release_buffer().
      lavfi: add a new function av_buffersrc_buffer().
      lavfi: add avfilter_copy_frame_props()
      lavc: add format field to AVFrame
      lavc: add width and height fields to AVFrame
      lavc: add a sample_aspect_ratio field to AVFrame
      doxy: add website-alike style to the html output
      FAQ: add an entry for common error when using -profile
    
    Conflicts:
    	avconv.c
    	cmdutils.c
    	doc/APIchanges
    	libavcodec/avcodec.h
    	libavcodec/mpegvideo.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavfilter/Makefile
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/src_movie.c
    	libavfilter/vsrc_buffer.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    484e59a0
avs.c 5.17 KB