Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 10:41:26 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 10:46:51 +0000 (11:46 +0100)
commit85b7b0c519f8d9491b4c0340329a605cc97c8984
tree7990305137bc5ece3e78f58218e67982853383ea
parent92cbd775687204f9750a09c69f97702719036aab
parent0ea430c75b8d90449d2878ad84669a2da2ad3cbc
Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'

* commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
  lclenc: use the AVFrame API properly.

Conflicts:
libavcodec/lclenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/lclenc.c