diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 01:28:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 01:28:57 +0200 |
| commit | 9e810a98a26391fd32f94e984a0a997ad77b77fe (patch) | |
| tree | 931df66abe50af9087c6b67754bfec0dec25728e /libavcodec/Makefile | |
| parent | 99558270ed1e1c0d8906439b47085860ee0b08bd (diff) | |
| parent | 650060dfb665552442ec11b456660e3e9a9d9016 (diff) | |
Merge commit '650060dfb665552442ec11b456660e3e9a9d9016'
* commit '650060dfb665552442ec11b456660e3e9a9d9016':
hevc_parser: parse and export some stream parameters
Conflicts:
configure
libavcodec/hevc_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index dfda9b406a..e33c87c705 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -832,7 +832,7 @@ 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 -OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o +OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_parse.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ |