Merge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:30:31 +0000 (23:30 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:30:31 +0000 (23:30 -0300)
* commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb':
  arm: Remove a redundant check in fmtconvert_init_arm.c

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/arm/fmtconvert_init_arm.c

Simple merge