diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:40:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:31:14 +0100 |
| commit | 2d7f20d2bbb1c30686c6a55cca8e3d71832a3a2e (patch) | |
| tree | 4203a3256294a0686d717e2fa2705ba105ac7cef /ffprobe.c | |
| parent | 3976c50fc1ff2fe4e7c224791cecc0faacbe8274 (diff) | |
| download | ffmpeg-2d7f20d2bbb1c30686c6a55cca8e3d71832a3a2e.tar.gz | |
Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'
* commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9':
escape124: use the AVFrame API properly.
qtrle: use the AVFrame API properly.
cljr: use the AVFrame API properly.
cinepak: use the AVFrame API properly.
Conflicts:
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/qtrle.c
See: 80e9e63c libavcodec/cinepak.c
See: 71c378984b0bd5470f67c424a79a4750f84d2d3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bfb1f44d246f4ed97d5cad9c1eace8a20951ff76)
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