utils: resolve conflicts
rawdec: resolve conflcits

compared to nicolas variant this looses 1 hunk (hint in case something doesnt work)
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context

This could otherwise lead to ABI issues when the size of AVFrame changes in avutil.
cljr: fix compilation