diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:07:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:31:20 +0100 |
| commit | b7cb77a3228f19e9550f7cb917dc270a553a4fd1 (patch) | |
| tree | f5664118ccabe9fef32723a364407eb70ed6e110 /ffprobe.c | |
| parent | 2d7f20d2bbb1c30686c6a55cca8e3d71832a3a2e (diff) | |
| download | ffmpeg-b7cb77a3228f19e9550f7cb917dc270a553a4fd1.tar.gz | |
Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'
* commit '2d2a92f72199823a92e4e226c32e42a27ec801c0':
dxa: use the AVFrame API properly.
qpeg: use the AVFrame API properly.
cin video: use the AVFrame API properly.
msvideo1: use the AVFrame API properly.
Conflicts:
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5219afc09d8e97e18917738cbc052f903df9a619)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions