diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 19:32:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 19:42:49 +0200 |
| commit | ae77266fce26eac4f5267d158c65bdebfb64f780 (patch) | |
| tree | b731b91cf7982db063f38b3da8489484aefa43a3 /libavutil/Makefile | |
| parent | 43c157f4a46cb76739f07782d23d1e4ff8da3253 (diff) | |
| parent | 78071a1420b425dfb787ac739048f523007b8139 (diff) | |
| download | ffmpeg-ae77266fce26eac4f5267d158c65bdebfb64f780.tar.gz | |
Merge commit '78071a1420b425dfb787ac739048f523007b8139'
* commit '78071a1420b425dfb787ac739048f523007b8139':
pixfmt: add AV_ prefixes to PIX_FMT_*
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 318f746446..66e9bb422c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -32,6 +32,7 @@ HEADERS = adler32.h \ md5.h \ mem.h \ dict.h \ + old_pix_fmt.h \ opt.h \ parseutils.h \ pixdesc.h \ |