virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
80,008 Commits 37 Branches 400 Tags 462 MiB
8767470fb5
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
9d6a27d533 Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f' 
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:26:23 +01:00
Diego Biurrun
57f09608e1 dsputil: Move thirdpel-related bits into their own context 2014-03-22 06:17:30 -07:00