Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Dec 2011 02:35:54 +0000 (03:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Dec 2011 03:10:47 +0000 (04:10 +0100)
commit484e59a0a0329c4005ddacd05051925345f4362f
treee5521f4eb5095df300545bb30694d1e3427115c9
parentc48f67f06ec3b887626b5938987d2a46bd52cf77
parent80dc7c0160fb27e46fc0caae8af10b3d63730c7c
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
Doxyfile
avconv.c
doc/faq.texi
ffmpeg.c
libavcodec/avcodec.h
libavcodec/avs.c
libavcodec/mpegvideo.c
libavcodec/pthread.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/avcodec.c
libavfilter/avcodec.h
libavfilter/avfilter.h
libavfilter/src_movie.c
libavfilter/vsrc_buffer.c