diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:06:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:10:15 +0100 |
| commit | 94a849b8b6c3e4a90361485b2e12a9a5c35833a3 (patch) | |
| tree | 703f7ceb7760983dc163120399bd67540b7ca126 /libavcodec/dv.h | |
| parent | 785066ae8aaf0c241fb94c74fadf61ae62c34530 (diff) | |
| parent | d4f1188d1a662fed5347e70016da49e01563e8a8 (diff) | |
| download | ffmpeg-streaming-94a849b8b6c3e4a90361485b2e12a9a5c35833a3.zip ffmpeg-streaming-94a849b8b6c3e4a90361485b2e12a9a5c35833a3.tar.gz | |
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
dv: use AVFrame API properly
Conflicts:
libavcodec/dvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.h')
| -rw-r--r-- | libavcodec/dv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dv.h b/libavcodec/dv.h index 23dcf63..73ceb7f 100644 --- a/libavcodec/dv.h +++ b/libavcodec/dv.h @@ -34,7 +34,7 @@ typedef struct DVVideoContext { const DVprofile *sys; - AVFrame picture; + AVFrame *frame; AVCodecContext *avctx; uint8_t *buf; |
