diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 03:59:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 03:59:37 +0100 |
| commit | acd7505351d164e87589cff930dcaeb51fad6cc6 (patch) | |
| tree | bff4ef413a4457cf3f36332384efc45b9241df8e /tests | |
| parent | 6e380cc28f25c80f4a5fab4faa726fbdf90de7f9 (diff) | |
| parent | a91d3658d9a73db120e49219c9c2b6a9470b1c9f (diff) | |
| download | ffmpeg-acd7505351d164e87589cff930dcaeb51fad6cc6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions