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)
commit68e479e3ada8ebdb8f2fdb2f339cc9992757eb85
treec0187f8d9a9b2128c5b3063c9288ecdc7ec58286
parent507e3f7d26ce7ad75ff146748ae285a8dee3b924
parentb487add7ecf78efda36d49815f8f8757bd24d4cb
Merge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'

* commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb':
  arm: Remove a redundant check in fmtconvert_init_arm.c

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