github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2013-11-17	Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'	Michael Niedermayer
	* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf': asvenc: use the AVFrame API properly. a64multienc: use the AVFrame API properly. Conflicts: libavcodec/vaapi_mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16	asvenc: use the AVFrame API properly.	Anton Khirnov

2013-02-26	Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'	Michael Niedermayer
	* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26	Remove unnecessary dsputil.h #includes	Diego Biurrun

2012-10-10	Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'	Michael Niedermayer
	* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702': swscale: Do not make ff_ symbols globally visible. rtspdec: use av_strlcpy for writing into fixed size buffer g722enc: fix size argument in memset http: use av_strlcpy instead of strcpy() without size checks avfilter: correct memcpy size avfilter_copy_buf_props() lavc: split asv12 encoder/decoder Conflicts: libavcodec/asvdec.c libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-09	lavc: split asv12 encoder/decoder	Anton Khirnov