Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Dec 2012 13:27:38 +0000 (14:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Dec 2012 13:27:38 +0000 (14:27 +0100)
commit83d4a8442ca458ad77d77750f90a430040fd0f48
tree7d2663aa0e9f5a97efef3fa90ed14ec516aaaa8a
parent2a9443a110e1865523fee32404890097fb6d1d93
parentc73c87b41298ff81b5a86569b0f680a556fc1a21
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c