diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-19 12:43:21 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-19 12:50:24 +0200 |
| commit | 0ed14bba12328cc8d85ef4aaf6916f15528830b5 (patch) | |
| tree | 1c8cb1dfde91cbeb259bb6fac6a9e267acd7c820 /libavcodec/Makefile | |
| parent | 34ec084b84817ca0b00544ca8e1029e6073c1e51 (diff) | |
| parent | 72da8d9bb24d1b1bf74c2f1108650c0da0054d2e (diff) | |
| download | ffmpeg-0ed14bba12328cc8d85ef4aaf6916f15528830b5.tar.gz | |
Merge commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e'
* commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e':
h264_parser: remove the remaining dependencies on the h264 decoder
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 82d5409158..91df1ac998 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -924,7 +924,8 @@ OBJS-$(CONFIG_G729_PARSER) += g729_parser.o OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o -OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_parse.o h2645_parse.o +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_parse.o h2645_parse.o \ + h264_ps.o h264_sei.o h264data.o OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o h2645_parse.o hevc_ps.o hevc_data.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o |