[mythtv-commits] mythtv branch devel/resync-ffmpeg updated by jyavenard. v0.27-pre2-890-g0770c5d

Git Repo Owner noreply at mythtv.org
Sat Mar 30 12:37:42 UTC 2013


The branch, devel/resync-ffmpeg has been updated on the
mythtv repository by gitolite user jyavenard.
       via  0770c5d1a0674f158f3b6d8a9ee7c8c818dec68a (commit)
      from  cc2f9dd7c3e4632d167b8a9fd90e41b5c16f1819 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0770c5d1a0674f158f3b6d8a9ee7c8c818dec68a
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sat, 30 Mar 2013 22:36:00 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sat, 30 Mar 2013 22:36:00 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0770c5d1a0674f158f3b6d8a9ee7c8c818dec68a

FFmpeg resync to FFmpeg release/1.1 at SHA1 fc7071cb53ded2e332947ce2145b587c5bdcd075
Conflict in libavcodec/mpegaudio_parser.c



-----------------------------------------------------------------------

Summary of changes:
 mythtv/external/FFmpeg/MAINTAINERS                 |    3 +-
 mythtv/external/FFmpeg/README.sync                 |    1 +
 mythtv/external/FFmpeg/RELEASE                     |    2 +-
 mythtv/external/FFmpeg/VERSION                     |    2 +-
 mythtv/external/FFmpeg/doc/Doxyfile                |    2 +-
 mythtv/external/FFmpeg/libavcodec/aacsbr.c         |   22 ++-
 mythtv/external/FFmpeg/libavcodec/atrac3.c         |    5 +-
 mythtv/external/FFmpeg/libavcodec/dnxhddec.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/dpxenc.c         |    1 +
 mythtv/external/FFmpeg/libavcodec/eamad.c          |   15 ++
 mythtv/external/FFmpeg/libavcodec/h264.c           |    6 +
 mythtv/external/FFmpeg/libavcodec/libmp3lame.c     |    2 +-
 mythtv/external/FFmpeg/libavcodec/libx264.c        |    2 +-
 mythtv/external/FFmpeg/libavcodec/mjpegdec.c       |    5 +-
 .../external/FFmpeg/libavcodec/mpegaudio_parser.c  |    8 +-
 mythtv/external/FFmpeg/libavcodec/msrledec.c       |   67 +++---
 mythtv/external/FFmpeg/libavcodec/png.c            |    4 +-
 mythtv/external/FFmpeg/libavcodec/psymodel.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/shorten.c        |  241 ++++++++++---------
 mythtv/external/FFmpeg/libavcodec/vmdav.c          |    2 +-
 mythtv/external/FFmpeg/libavcodec/wmadec.c         |    5 +
 mythtv/external/FFmpeg/libavcodec/wmaprodec.c      |   12 +-
 mythtv/external/FFmpeg/libavcodec/xxan.c           |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_gradfun.c    |    3 +-
 mythtv/external/FFmpeg/libavfilter/vf_hqdn3d.c     |   10 +-
 mythtv/external/FFmpeg/libavformat/flacdec.c       |    8 +-
 mythtv/external/FFmpeg/libavformat/flvenc.c        |    3 +
 mythtv/external/FFmpeg/libavformat/hls.c           |    2 +
 mythtv/external/FFmpeg/libavformat/iff.c           |    3 +
 mythtv/external/FFmpeg/libavformat/movenc.c        |    3 +
 mythtv/external/FFmpeg/libavformat/mp3dec.c        |    6 +-
 mythtv/external/FFmpeg/libavformat/mpegts.c        |   14 +-
 mythtv/external/FFmpeg/libavformat/rmdec.c         |   13 +
 mythtv/external/FFmpeg/libavformat/utils.c         |    2 +-
 mythtv/external/FFmpeg/libavutil/lzo.c             |    3 +-
 mythtv/external/FFmpeg/tests/ref/lavf-fate/mp3     |    4 +-
 mythtv/external/FFmpeg/tests/ref/lavf/dpx          |    6 +-
 37 files changed, 303 insertions(+), 190 deletions(-)

-- 



More information about the mythtv-commits mailing list