From b53b26c180e0c507f2de09cce49c19b984373bae Mon Sep 17 00:00:00 2001
From: Mike Terzo <mike@terzo.org>
Date: Thu, 15 Sep 2016 23:42:50 -0400
Subject: [PATCH] Adding ubuntu 14.04 to build along with 12.04 in travis-ci

---
 .travis.yml | 56 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d127afa3..79eb3aaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,42 @@
-language: c
-compiler: gcc
-before_script: autoreconf -fiv
-addons:
-  apt:
-    packages:
-      - libavformat-dev
-      - libavcodec-dev
-      - libav-tools
-      - libavutil-dev
-      - libswscale-dev 
-      - ffmpeg
-      - libjpeg8-dev
-      - libv4l-dev 
-      - libzip-dev
+before_script:
+  - autoreconf -fiv
+  - avplay -version
 script: ./configure && make
+
+matrix:
+  include:
+  - os: linux
+    language: c
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+        - libavformat-dev
+        - libavcodec-dev
+        - libav-tools
+        - libavutil-dev
+        - libswscale-dev
+        - ffmpeg
+        - libjpeg8-dev
+        - libv4l-dev
+        - libzip-dev
+  - os: linux
+    language: c
+    compiler: gcc
+    sudo: rquired
+    dist: trusty
+    addons:
+      apt:
+        sources:
+        - sourceline: 'ppa:mc3man/trusty-media'
+        packages:
+        - libavformat-dev
+        - libavcodec-dev
+        - libav-tools
+        - libavutil-dev
+        - libswscale-dev
+        - ffmpeg
+        - libjpeg8-dev
+        - libv4l-dev
+        - libzip-dev
+