vmdav: resolve conflicts

Note: not sure if avcodec_get_frame_defaults() is needed for the local AVFrame.
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts

TESTME: some particular attention is needed on metadata
qpeg: resolve conflicts (FIXME/TESTME).

 - current is an attempt to honor changes in a0db7424
 - need to be tested with fate + should be tested with V-codecs/QPEG/Clock.avi
 - potential overlapping refdata and dst memcpy in qpeg_decode_inter()
 - on a side note, AVFrame ABI issue + no proper AVFrame init (since no
   alloc with the API) but that is problematic in the fork as well
interplayvideo: fix compilation (untested)