Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:33:27 +0000 (12:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 02:32:43 +0000 (03:32 +0100)
commit4d373ee8e4c9db7e5d3bcdb35457211bddf2fbff
tree16f237cd97200ff33d8682e966ed5ecc8bc8c3d1
parent6133f450bb816db578c5253de9e072078fdf8edc
Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'

* commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476':
  eatgv: use the AVFrame API properly.
  libxavs: use the AVFrame API properly.
  nuv: use the AVFrame API properly.
  flashsvenc: use the AVFrame API properly.

Conflicts:
libavcodec/eatgv.c
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0c0629dd963b00f989172f0c599353b6b288c37)

Conflicts:

libavcodec/eatgv.c
Author of the merged code: Anton Khirnov
libavcodec/eatgv.c
libavcodec/flashsvenc.c
libavcodec/libxavs.c
libavcodec/nuv.c