diff -Nru chromium-codecs-ffmpeg-0.5+svn20091210r34297+35171+35217/debian/changelog chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/changelog
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35171+35217/debian/changelog	2009-12-24 16:24:56.000000000 +0000
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/debian/changelog	2009-12-24 16:24:57.000000000 +0000
@@ -1,5 +1,5 @@
-chromium-codecs-ffmpeg (0.5+svn20091210r34297+35171+35217-0ubuntu1~ucd1~karmic) karmic; urgency=low
+chromium-codecs-ffmpeg (0.5+svn20091210r34297+35231+35248-0ubuntu1~ucd1~karmic) karmic; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
- -- Fabien Tassin <fta@ubuntu.com>  Wed, 23 Dec 2009 17:00:02 +0100
+ -- Fabien Tassin <fta@ubuntu.com>  Thu, 24 Dec 2009 17:00:01 +0100
diff -Nru chromium-codecs-ffmpeg-0.5+svn20091210r34297+35171+35217/src/build/linux/system.gyp chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/src/build/linux/system.gyp
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35171+35217/src/build/linux/system.gyp	2009-12-15 16:01:10.000000000 +0000
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/src/build/linux/system.gyp	2009-12-24 16:00:57.000000000 +0000
@@ -81,7 +81,15 @@
               ],
               'direct_dependent_settings': {
                 'cflags': [
-                  '-Inet/third_party/nss/ssl',
+                  # We need for our local copies of the libssl headers to come
+                  # first, otherwise the code will build, but will fallback to
+                  # the set of features advertised in the system headers.
+                  # Unfortunately, there's no include path that we can filter
+                  # out of $(pkg-config --cflags nss) and GYP include paths
+                  # come after cflags on the command line. So we have these
+                  # bodges:
+                  '-I../net/third_party/nss/ssl',  # for scons
+                  '-Inet/third_party/nss/ssl',     # for make
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
               },
diff -Nru chromium-codecs-ffmpeg-0.5+svn20091210r34297+35171+35217/src/ffmpeg.gyp chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/src/ffmpeg.gyp
--- chromium-codecs-ffmpeg-0.5+svn20091210r34297+35171+35217/src/ffmpeg.gyp	2009-12-23 16:00:58.000000000 +0000
+++ chromium-codecs-ffmpeg-0.5+svn20091210r34297+35231+35248/src/ffmpeg.gyp	2009-12-24 16:00:54.000000000 +0000
@@ -25,7 +25,7 @@
     # Allow overridding the selection of which FFmpeg binaries to copy via an
     # environment variable.  Affects the ffmpeg_binaries target.
     'conditions': [
-      ['chromeos!=0', {
+      ['chromeos!=0 or toolkit_views!=0', {
         'ffmpeg_branding%': '<(branding)OS',
       },{  # else chromeos==0, assume Chrome/Chromium.
         'ffmpeg_branding%': '<(branding)',