Merge commit '30015305f3b523ed7640f2c3c58b017140533c58'
authorClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:16:50 +0000 (22:16 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:18:26 +0000 (22:18 +0200)
* commit '30015305f3b523ed7640f2c3c58b017140533c58':
  Use avpriv_request_sample() where appropriate

Only the roqvideo chunk is merged because we actually support 24bpp
flic, see 5781c983d880e17ffc9b283baa9fb13bad1748f9.

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/roqvideodec.c

Simple merge