Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 23:20:56 +0000 (00:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 23:21:22 +0000 (00:21 +0100)
* qatar/master:
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/fic.c

Simple merge