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

Age	Commit message (Collapse)	Author
2016-06-21	Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'	Clément Bœsch
	* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04	cosmetics: Fix spelling mistakes	Vittorio Giovara
	Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-02-24	Merge commit '29c2d06d67724e994980045afa055c6c34611b30'	Derek Buitenhuis
	* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-18	cosmetics: Drop empty comment lines	Diego Biurrun

2015-04-05	avcodec/error_resilience: Avoid race with updating the error_count	Michael Niedermayer
	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27	Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'	Michael Niedermayer
	* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094': error_resilience: move the MECmpContext initialization into ER code Conflicts: libavcodec/error_resilience.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27	error_resilience: move the MECmpContext initialization into ER code	Anton Khirnov
	Currently, it needs to be initialized by the ER caller (which is currently either a mpegvideo decoder or h264dec). However, since none of those decoders use MECmpContext for anything except ER, it makes more sense to handle it purely inside ER.
2014-07-18	Merge commit '2d60444331fca1910510038dd3817bea885c2367'	Michael Niedermayer
	* commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17	dsputil: Split motion estimation compare bits off into their own context	Diego Biurrun

2014-04-22	Various small spelling fixes.	Reimar Döffinger
	Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-03-17	avcodec/error_resilience: fix the case when MVs are not available	Michael Niedermayer
	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17	Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'	Michael Niedermayer
	* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17	er: move relevant fields from Picture to ERPicture	Vittorio Giovara
	This is done to disentangle ER from mpegvideo. In order to use a classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function to set the fields. Please note that buffers need to be allocated before calling ff_er_frame_end().
2013-02-17	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer
	* qatar/master: error_resilience: add required headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-17	error_resilience: add required headers.	Anton Khirnov

2013-02-16	Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'	Michael Niedermayer
	* commit '54974c62982ae827becdbdb9b620b7ba75d079a0': error_resilience: decouple ER from MpegEncContext Conflicts: libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15	error_resilience: decouple ER from MpegEncContext	Anton Khirnov