diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 15:14:32 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-21 15:37:01 +0100 |
commit | 494945cb66fae7678efbde0be14b4d5e6fa5824d (patch) | |
tree | 3686bdf1b506f86909d609e4ecb3bbdc8476e3fd /libavcodec/Makefile | |
parent | 4bf3bc6f96cfbf68191625ade624ac97595de781 (diff) | |
parent | d1d9efaae6c7e8466b06c30ca21c6b569dd2e480 (diff) | |
download | ffmpeg-streaming-494945cb66fae7678efbde0be14b4d5e6fa5824d.zip ffmpeg-streaming-494945cb66fae7678efbde0be14b4d5e6fa5824d.tar.gz |
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
avcodec: split avpicture from imgconvert
pixdesc: add PIX_FMT_ALPHA flag
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 938b5ac..e937c4b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -16,6 +16,7 @@ HEADERS = avcodec.h \ OBJS = allcodecs.o \ audioconvert.o \ avpacket.o \ + avpicture.o \ bitstream.o \ bitstream_filter.o \ codec_desc.o \ |