Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 0 deletions

diff --git a/configure b/configure
index c0beb11a72..a211975cc3 100755
--- a/configure
+++ b/configure
@@ -1915,6 +1915,7 @@ ffv1_decoder_select="dsputil golomb rangecoder"
 ffv1_encoder_select="dsputil rangecoder"
 ffvhuff_decoder_select="dsputil llviddsp"
 ffvhuff_encoder_select="dsputil huffman llviddsp"
+fic_decoder_select="dsputil golomb"
 flac_decoder_select="golomb"
 flac_encoder_select="dsputil golomb lpc"
 flashsv_decoder_select="zlib"