Merge svn changes up to r28310

The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.

1 files changed, 2 insertions, 0 deletions

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index dabc7c4962..cfa3580cbc 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -452,6 +452,8 @@ const char *sws_format_name(enum PixelFormat format)
             return "nv21";
         case PIX_FMT_YUV440P:
             return "yuv440p";
+        case PIX_FMT_VDPAU_H264:
+            return "vdpau_h264";
         default:
             return "Unknown format";
     }