[Pkg-gstreamer-commits] [gst-libav1.0] 02/03: Merge tag 'upstream/1.4.2'

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gst-libav1.0.

commit f3ae4e9ba5e776c1f3688b203362ae9da65b3090
Merge: 9bcf1ff 610d75e
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Fri Sep 19 14:49:38 2014 +0300

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2

 ChangeLog                                          | 39 ++++++++++++-
 Makefile.in                                        |  4 +-
 NEWS                                               |  2 +-
 configure                                          | 34 +++++------
 configure.ac                                       |  4 +-
 .../html/gst-libav-plugins-plugin-libav.html       |  2 +-
 docs/plugins/html/index.html                       |  2 +-
 docs/plugins/inspect/plugin-libav.xml              |  2 +-
 ext/libav/gstavviddec.c                            |  7 +--
 gst-libav.doap                                     | 10 ++++
 gst-libav.spec                                     |  2 +-
 gst-libs/ext/libav/Changelog                       | 14 +++++
 gst-libs/ext/libav/LICENSE                         |  1 +
 gst-libs/ext/libav/RELEASE                         |  2 +-
 gst-libs/ext/libav/avconv_opt.c                    |  8 ++-
 gst-libs/ext/libav/doc/avconv.texi                 |  6 +-
 gst-libs/ext/libav/libavcodec/mpegvideo_enc.c      |  4 +-
 gst-libs/ext/libav/libavcodec/proresenc.c          | 68 ++++++++++++++++++----
 gst-libs/ext/libav/libavdevice/pulse.c             |  5 ++
 gst-libs/ext/libav/libavfilter/setpts.c            | 17 +++---
 gst-libs/ext/libav/libavformat/mpegenc.c           |  2 +-
 21 files changed, 175 insertions(+), 60 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-libav1.0.git