diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:07:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:07:51 +0100 |
| commit | 52066bdb300b3a2cdef48897d0c864410b259084 (patch) | |
| tree | b68ed4c51fd623eb36912ce58555c1813e7e3514 /libavresample | |
| parent | d7b20bfbb582c369518c73720fb4b0266714cde6 (diff) | |
| parent | c74f81786d434dfaf9b3dff06aa96bfd23d0127b (diff) | |
| download | ffmpeg-52066bdb300b3a2cdef48897d0c864410b259084.tar.gz | |
Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'
* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b':
nuv: cosmetics: pretty-printing
Conflicts:
libavformat/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions