Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 21:50:56 +0000 (23:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 21:50:56 +0000 (23:50 +0200)
commitcb8763bda7e5e59064193e6b29b0f806560f66d3
tree93d5bfe924618f2d1fc1d02e621ddf7291470526
parentb3f461508176236bd9d7c2762fd70e339b1494f8
parent2ea2612df508abdd1f97c6a6ef56275a52c5c41e
Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'

* commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e':
  svq1enc: Rename SVQ1Context to SVQ1EncContext

Conflicts:
libavcodec/svq1enc.c

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