Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

FFmpeg MVC
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

9d6a27d5

Commit 9d6a27d5 authored 11 years ago by Michael Niedermayer

Downloads
- Plain Diff

Merge commit '57f09608'


* commit '57f09608':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

parents 74fed968 57f09608

Branches

Tags

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

configure 2 additions, 1 deletion

configure
doc/optimization.txt 0 additions, 3 deletions

doc/optimization.txt
libavcodec/Makefile 1 addition, 0 deletions

libavcodec/Makefile
libavcodec/dsputil.c 1 addition, 298 deletions

libavcodec/dsputil.c
libavcodec/dsputil.h 0 additions, 16 deletions

libavcodec/dsputil.h
libavcodec/h264qpel_template.c 1 addition, 0 deletions

libavcodec/h264qpel_template.c
libavcodec/hpel_template.c 0 additions, 45 deletions

libavcodec/hpel_template.c
libavcodec/hpeldsp_template.c 1 addition, 0 deletions

libavcodec/hpeldsp_template.c
libavcodec/svq3.c 11 additions, 7 deletions

libavcodec/svq3.c
libavcodec/tpel_template.c 80 additions, 0 deletions

libavcodec/tpel_template.c
libavcodec/tpeldsp.c 333 additions, 0 deletions

libavcodec/tpeldsp.c
libavcodec/tpeldsp.h 59 additions, 0 deletions

libavcodec/tpeldsp.h

with 489 additions and 370 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment