Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 08:51:19 +0000 (10:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 08:51:19 +0000 (10:51 +0200)
commit9328ae484338b70a7f2dbcd420bbbac499df76cc
tree5c4dfb7bbbb37243899f75dcb839957d7d003591
parentbad8f04b0454441edb0b7a1565e28c0b1a07f7ed
parentd9c89ef86b9400e50c2486f9406fad15c85bab22
Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'

* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
  cllc: Use outbuf in RGB and ARGB functions
  cllc: Implement YUV support

Conflicts:
libavcodec/cllc.c

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