diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 12:37:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 12:37:37 +0200 |
| commit | 2ae5ac78d82049a98416221ab6969b975299c8c7 (patch) | |
| tree | 546f122f3932a650b985eec2dca4f472d7b56447 /libavdevice/caca.c | |
| parent | da4cd615023365f1af8056cbb50ac96c91af07a1 (diff) | |
| parent | b18412171fda4f09bbc2f07858c5c1bb43dfae84 (diff) | |
| download | ffmpeg-2ae5ac78d82049a98416221ab6969b975299c8c7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264_sei: K&R formatting cosmetics
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/caca.c')
0 files changed, 0 insertions, 0 deletions