diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 05:10:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 05:10:06 +0200 |
| commit | e1f98f22313bfde3c85ac566902adeb118ec6d18 (patch) | |
| tree | dc266dcf0506656f9712aed1064c2dd4de7b39a9 /libavcodec/cljr.c | |
| parent | d28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9 (diff) | |
| parent | 76efedeadb1f6bf79020c44a71dd0cee13d932ad (diff) | |
| download | ffmpeg-e1f98f22313bfde3c85ac566902adeb118ec6d18.tar.gz | |
Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'
* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
qdm2: formatting cosmetics
Conflicts:
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cljr.c')
0 files changed, 0 insertions, 0 deletions