diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:29:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:29:38 +0200 |
| commit | 2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7 (patch) | |
| tree | a9d134456b0ac8c0216b68ec61d6a60aaf0496f2 /libavcodec/mpeg4video.c | |
| parent | 16bb8faac6d51e342b64974ceb2f8edd7955f9fa (diff) | |
| parent | 5ce04c14dd3dd3670cbdba82275a3a72c716ec6f (diff) | |
| download | ffmpeg-2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7.tar.gz | |
Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'
* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
Use correct Doxygen syntax
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.c')
0 files changed, 0 insertions, 0 deletions