diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 14:27:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 14:27:38 +0100 |
| commit | 83d4a8442ca458ad77d77750f90a430040fd0f48 (patch) | |
| tree | 7d2663aa0e9f5a97efef3fa90ed14ec516aaaa8a /libavcodec/libschroedingerenc.c | |
| parent | 2a9443a110e1865523fee32404890097fb6d1d93 (diff) | |
| parent | c73c87b41298ff81b5a86569b0f680a556fc1a21 (diff) | |
| download | ffmpeg-83d4a8442ca458ad77d77750f90a430040fd0f48.tar.gz | |
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>
Diffstat (limited to 'libavcodec/libschroedingerenc.c')
0 files changed, 0 insertions, 0 deletions