diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:56:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:56:37 +0200 |
| commit | e853cf53256f847fc1b8436a4bef060177a01bb2 (patch) | |
| tree | 580de29c0c28427ce3c53b3b26800fc6f01cc76f /CREDITS | |
| parent | 8299ed261a950a7b114f07b37ba45bf0b539345b (diff) | |
| parent | 330ad1f6a53a37dec228cb424ca57e1268fafc64 (diff) | |
| download | ffmpeg-e853cf53256f847fc1b8436a4bef060177a01bb2.tar.gz | |
Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'
* commit '330ad1f6a53a37dec228cb424ca57e1268fafc64':
h264_ps: K&R formatting cosmetics
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions