diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 12:50:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 12:50:40 +0200 |
| commit | b634c12cb9673428672aa0fb216e866709451e61 (patch) | |
| tree | 2c37c4a28228e4b961c95e2f83ef0554e339b3e5 /ffmpeg_filter.c | |
| parent | 8d403d9c89febcbca094206a866c82426fbcd1c8 (diff) | |
| parent | 93f29948e4b06acfb96e7f82d373ef86d6dc55f7 (diff) | |
| download | ffmpeg-b634c12cb9673428672aa0fb216e866709451e61.tar.gz | |
Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'
* commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7':
mpeg4video: Fix doxygen comment syntax to document correct struct member
Conflicts:
libavcodec/mpeg4video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions