[FFmpeg-cvslog] Merge commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f'

Michael Niedermayer git at videolan.org
Sat Jul 19 04:32:08 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 19 04:15:38 2014 +0200| [a86d527c8b37d303f6ee73ac2e7025cb0cbea14c] | committer: Michael Niedermayer

Merge commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f'

* commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f':
  dct-test: Reuse enum idct_permutation_type instead of duplicating it

Conflicts:
	libavcodec/dct-test.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a86d527c8b37d303f6ee73ac2e7025cb0cbea14c
---





More information about the ffmpeg-cvslog mailing list