libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2013-02-17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: error_resilience: add required headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	error_resilience: add required headers.	Anton Khirnov	2013-02-17
\| \|
* \|	Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'	Michael Niedermayer	2013-02-16
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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>
*	error_resilience: decouple ER from MpegEncContext	Anton Khirnov	2013-02-15