Merge commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb'

Browse Source

* commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb':
  bfin: Match DEFUN_END macros to the right functions

Conflicts:
	libavcodec/bfin/pixels_bfin.S

This bug seems not to have existed in our bfin code, thus
no change in this merge

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

...

This commit is contained in:

Michael Niedermayer

2013-04-16 00:40:57 +02:00

parent 41985cb0ab c0dcf89887

commit 398b9ed28f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available