BUG: mjpg-streaming broken with motion 3.2.12

This might be a duplicate, but there are lots of us using motion with mjpg-streamer. I believe I represent the large contingent of users who are not programmers, but who can usually hack our way through compiling code from source. I'm using motion on Ubuntu 10.04 and 12.04. When I upgraded to motion 3.2.12, everything broke in my environment! I know there is a patch for the mjpg streaming issue, but after removing the stock ffmpeg and installing the approved version (from motion web site, ffmpeg-for-motion-3.2.5/), I'm getting the below error when compiling motion (trunkREV558).

gcc -g -O2 -D_REENTRANT -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DHAVE_FFMPEG -I/usr/local/include/ffmpeg -DMOTION_V4L2 -DMOTION_V4L2_OLD -DTYPE_32BIT="int" -DHAVE_BSWAP   -march=native -mtune=native -Wall -DVERSION=\"trunkREV557\" -Dsysconfdir=\"/usr/local/etc\"    -c -o track.o track.c
track.c: In function ‘servo_center’:
track.c:566:18: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
track.c: In function ‘uvc_center’:
track.c:936:29: error: storage size of ‘control_s’ isn’t known
track.c:938:24: error: ‘V4L2_CID_PRIVATE_BASE’ undeclared (first use in this function)
track.c:938:24: note: each undeclared identifier is reported only once for each function it appears in
track.c:941:24: error: ‘VIDIOC_S_CTRL’ undeclared (first use in this function)
track.c:951:31: error: storage size of ‘queryctrl’ isn’t known
track.c:954:24: error: ‘VIDIOC_QUERYCTRL’ undeclared (first use in this function)
track.c:951:31: warning: unused variable ‘queryctrl’ [-Wunused-variable]
track.c:936:29: warning: unused variable ‘control_s’ [-Wunused-variable]
track.c:984:25: error: storage size of ‘control_s’ isn’t known
track.c:984:25: warning: unused variable ‘control_s’ [-Wunused-variable]
track.c: In function ‘uvc_move’:
track.c:1080:29: error: storage size of ‘control_s’ isn’t known
track.c:1082:24: error: ‘V4L2_CID_PRIVATE_BASE’ undeclared (first use in this function)
track.c:1085:24: error: ‘VIDIOC_S_CTRL’ undeclared (first use in this function)
track.c:1080:29: warning: unused variable ‘control_s’ [-Wunused-variable]
track.c:1136:25: error: storage size of ‘control_s’ isn’t known
track.c:1136:25: warning: unused variable ‘control_s’ [-Wunused-variable]
make: *** [track.o] Error 1

Environment

Motion version:	3.2.12
ffmpeg version:	FFmpeg version CVS, Copyright (c) 2000-2004 Fabrice Bellard configuration: --enable-shared libavutil version: 49.0.0 libavcodec version: 51.7.0 libavformat version: 50.3.0
Shared libraries:	ffmpeg
Server OS:	Ubuntu 12.04

-- TomHinkle - 07 May 2013

Follow up

Fix record