diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-05-17 14:21:12 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-05-17 14:21:12 +0200 |
| commit | 15ad0232107496c3b12d8aaedfc3398b8cda9ee7 (patch) | |
| tree | 42a4576116d4e96448468acc18386efe004a2128 /libavcodec/Makefile | |
| parent | a9bb4cf87d1eb68f9ed2dc971e3400b95c1a6a78 (diff) | |
| parent | 8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6 (diff) | |
Merge commit '8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6'
* commit '8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6':
h264_parser: switch to h2645_parse for NAL unescaping
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 3f0ffd11b4..472e8f013d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -913,7 +913,7 @@ 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 +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_parse.o h2645_parse.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 |