vp3: resolve conflicts (ASSISTANCE NEEDED).

- One copy_fields() chunk change get dropped and was security relevant (247d30a7).
- Not sure if change from d5efa84f will get honored properly.
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation