[FFmpeg-cvslog] Merge commit '8de77b665d2a2f1cd560d2183fd4664298b30715'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 25 01:33:41 2014 +0200| [817627d925384a55dd04d3427b4791e04bb98899] | committer: Michael Niedermayer

Merge commit '8de77b665d2a2f1cd560d2183fd4664298b30715'

* commit '8de77b665d2a2f1cd560d2183fd4664298b30715':
  fate: Add fic-in-avi test

Conflicts:
	tests/ref/fate/fic-avi

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=817627d925384a55dd04d3427b4791e04bb98899
---