diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 18:00:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 18:03:04 +0100 |
| commit | b044e81f069cc97488868c3f2ef393c193644f0c (patch) | |
| tree | 541398d67de0b56e77bd4019beeafc1c9e817d1f /libavcodec/codec_desc.c | |
| parent | 6ff544e473a5ba9d583a4c8510d8a724e0a18c91 (diff) | |
| parent | ae3822bca16f1cdb2460a35b16f8ef636a04314e (diff) | |
| download | ffmpeg-b044e81f069cc97488868c3f2ef393c193644f0c.tar.gz | |
Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'
* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
imgconvert: remove PixFmtInfo
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
0 files changed, 0 insertions, 0 deletions