[FFmpeg-cvslog] Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

Michael Niedermayer git at videolan.org
Fri Mar 14 02:04:16 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 01:56:25 2014 +0100| [3141b04c7fd46ca09acbc4a7b4d89788df273dd7] | committer: Michael Niedermayer

Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
	libavcodec/bfin/hpel_pixels_bfin.S

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

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





More information about the ffmpeg-cvslog mailing list