diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:06:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 21:28:41 +0100 |
| commit | 9f864bd3247bab3939a317bfbe4444df02349587 (patch) | |
| tree | 6ec8e20f78df169fab9e258f1f8bdda48f5c7974 /doc/doxy-wrapper.sh | |
| parent | 117728cf8ff98942411eb55f6ccc89351f482717 (diff) | |
| download | ffmpeg-9f864bd3247bab3939a317bfbe4444df02349587.tar.gz | |
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
dv: use AVFrame API properly
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94a849b8b6c3e4a90361485b2e12a9a5c35833a3)
Conflicts:
libavcodec/dv.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'doc/doxy-wrapper.sh')
0 files changed, 0 insertions, 0 deletions