Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Feb 2014 18:02:46 +0000 (19:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Feb 2014 18:02:46 +0000 (19:02 +0100)
commit0c4bf87b296145e38510655d1a14196493d5c54e
tree63eb4722659980ba21abe4b72ab8a2f0e48f8a57
parentb08f554fdc0886ab9815b2e3db3ae8a93baa57c8
parentcde7df25ef74b85b5ce11d9171779f28f0c12d15
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>
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/fic.c
libavcodec/version.h
libavformat/riff.c