Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:40:59 +0000 (00:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 02:31:14 +0000 (03:31 +0100)
commit2d7f20d2bbb1c30686c6a55cca8e3d71832a3a2e
tree4203a3256294a0686d717e2fa2705ba105ac7cef
parent3976c50fc1ff2fe4e7c224791cecc0faacbe8274
Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'

* commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9':
  escape124: use the AVFrame API properly.
  qtrle: use the AVFrame API properly.
  cljr: use the AVFrame API properly.
  cinepak: use the AVFrame API properly.

Conflicts:
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/qtrle.c

See: 80e9e63c libavcodec/cinepak.c
See: 71c378984b0bd5470f67c424a79a4750f84d2d3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bfb1f44d246f4ed97d5cad9c1eace8a20951ff76)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cljr.c
libavcodec/escape124.c