Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:33:27 +0000 (12:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:33:27 +0000 (12:33 +0100)
commita0c0629dd963b00f989172f0c599353b6b288c37
tree9948f38dd870d440db9ac10f98bbf1275282b056
parent5b0c70c2499e20529d517b712910d6f4f72e9485
parent97168b204a0b6b79bb6c5f0d40efdf7fc2262476
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>
libavcodec/eatgv.c
libavcodec/flashsvenc.c
libavcodec/libxavs.c
libavcodec/nuv.c