OSDN Git Service

Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 00:05:37 +0000 (01:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 00:05:37 +0000 (01:05 +0100)
commit2beb81522e5994a377170a56f8f38b6a550e3f3b
treea775cd0130d6ce936f7fa4f4016496accdc5f998
parent0c1353ae338bac9a0c4052805f56f02952172223
parent8c09532672d7d3196ec52afefa2c96633bc17b62
Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'

* commit '8c09532672d7d3196ec52afefa2c96633bc17b62':
  rv10: K&R formatting cosmetics

Conflicts:
libavcodec/rv10.c

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