diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:00:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:00:22 +0100 |
| commit | 8bbb487e443a7979f223759a5d6c2d7662a5948d (patch) | |
| tree | dfcc859ca0fb087b36c4f7961f6e9e252fea7fdd /libavcodec/mpeg4video_parser.h | |
| parent | 9f16cb9e50a5a196af9244dc7d33ed193227528a (diff) | |
| parent | 130cefc9dcedea5babc349251fbeec6f037144ac (diff) | |
| download | ffmpeg-8bbb487e443a7979f223759a5d6c2d7662a5948d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/platform: Fix 10l typo
dsputil: Move STRIDE_ALIGN macro to the only place it is used
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.h')
0 files changed, 0 insertions, 0 deletions