diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:26:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:26:43 +0200 |
| commit | 3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c (patch) | |
| tree | 5da0b2be09d434d1e2aa254448bdd2561d72e7b1 /libavdevice/Makefile | |
| parent | cb20ca14a330ade01cb73c340976b86933e34c7d (diff) | |
| parent | 6d25c9db11e87ec58652de6588448225137b0c57 (diff) | |
| download | ffmpeg-3bc3c78a59d3ab2e62970e6a6531a93bb1b3b15c.tar.gz | |
Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'
* commit '6d25c9db11e87ec58652de6588448225137b0c57':
dsputil: Make square put/avg_pixels functions local to h264qpel
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/Makefile')
0 files changed, 0 insertions, 0 deletions