Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 17:26:59 +0000 (19:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 17:37:09 +0000 (19:37 +0200)
commit4c18c31438d0f3357fc705b6d03d74728045a17f
treeed06043e422f86fd37790429333d03094f5f5237
parent3a75c4e93b3b6f1aeb9343b933ff15776b5b4b41
parent1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
  h263: K&R formatting cosmetics

Conflicts:
libavcodec/h263dec.c

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