diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-13 03:00:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-13 03:49:36 +0200 |
| commit | f0e9ee8d9491898bec012f1295d83c6efa937c32 (patch) | |
| tree | c739d862dcc307b71f6850087cd55e9558a58cbd /libavcodec/Makefile | |
| parent | 3fe6bbd5dcdf603a8dac78b48adf6f0b6604143c (diff) | |
| download | ffmpeg-streaming-f0e9ee8d9491898bec012f1295d83c6efa937c32.zip ffmpeg-streaming-f0e9ee8d9491898bec012f1295d83c6efa937c32.tar.gz | |
Revert "H264: Split out hl_motion and template it, this seems a bit faster"
This reverts commit a50f0bea25a3da605cd547fe3bdfd36c8764b847.
This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge
Conflicts:
libavcodec/h264.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1580145..aa091bf 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -177,7 +177,7 @@ OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o mpeg4video.o \ ratecontrol.o h263.o ituh263enc.o \ flvenc.o mpeg12data.o \ mpegvideo.o error_resilience.o -OBJS-$(CONFIG_H264_DECODER) += h264.o h264_hl_motion.o \ +OBJS-$(CONFIG_H264_DECODER) += h264.o \ h264_loopfilter.o h264_direct.o \ cabac.o h264_sei.o h264_ps.o \ h264_refs.o h264_cavlc.o h264_cabac.o\ @@ -368,7 +368,7 @@ OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ mpegvideo.o error_resilience.o \ ituh263enc.o mpegvideo_enc.o \ ratecontrol.o mpeg12data.o -OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o h264_hl_motion.o \ +OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o \ h264_loopfilter.o h264_direct.o \ h264_sei.o h264_ps.o h264_refs.o \ h264_cavlc.o h264_cabac.o cabac.o \ @@ -612,7 +612,7 @@ OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o \ vorbis_data.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o -OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o h264_hl_motion.o \ +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \ cabac.o \ h264_refs.o h264_sei.o h264_direct.o \ h264_loopfilter.o h264_cabac.o \ |
