[mythtv-commits] mythtv branch devel/ffmpeg-sync-20120331 updated. v0.26-pre-37-g340a68d

Git Repo Owner noreply at mythtv.org
Thu Apr 12 05:10:56 UTC 2012

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "mythtv".

The branch, devel/ffmpeg-sync-20120331 has been updated
       via  340a68d90744be1509c0fe0bd66a518c949d81e4 (commit)
       via  b9ec51e519e63adfef2b97134fc0f0159a681e89 (commit)
      from  0311ea8713d95334d167cdc051e245437b15bffd (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 340a68d90744be1509c0fe0bd66a518c949d81e4
Author:     Gavin Hurlbut <ghurlbut at mythtv.org>
AuthorDate: Wed Apr 11 22:08:03 2012 -0700
Commit:     Gavin Hurlbut <ghurlbut at mythtv.org>
CommitDate: Wed Apr 11 22:08:03 2012 -0700

    OK, that was the right idea, but the wrong way around.
    Rename the functions in the ffmpeg mpegts.c that collide with ours and where
    we want ours to take precedence.  This was confusing the probe functionality
    the other way around.  Also, disable mpegts-ffmpeg demuxer.  The code should
    still be sucked in for wtv support though.

commit b9ec51e519e63adfef2b97134fc0f0159a681e89
Author:     Gavin Hurlbut <ghurlbut at mythtv.org>
AuthorDate: Wed Apr 11 20:48:12 2012 -0700
Commit:     Gavin Hurlbut <ghurlbut at mythtv.org>
CommitDate: Wed Apr 11 20:48:12 2012 -0700

    Move MythTV's mpegts to mpegts-mythtv.c to make easier merges
    Since our mpegts is so different from ffmpeg's and it's unlikely they will be
    converging any time soon, I'm moving our version as a new demuxer, and with
    the default name "mpegts" pointing at our version rather than ffmpeg's, which
    will be available as "mpegts-ffmpeg".


Summary of changes:
 mythtv/configure                                   |    4 +-
 mythtv/external/FFmpeg/libavformat/Makefile        |    3 +-
 mythtv/external/FFmpeg/libavformat/allformats.c    |    5 +-
 .../libavformat/{mpegts.c => mpegts-mythtv.c}      |   17 +-
 .../libavformat/{mpegts.h => mpegts-mythtv.h}      |   10 +-
 mythtv/external/FFmpeg/libavformat/mpegts.c        | 1095 ++------------------
 mythtv/external/FFmpeg/libavformat/mpegts.h        |   52 +-
 7 files changed, 140 insertions(+), 1046 deletions(-)
 copy mythtv/external/FFmpeg/libavformat/{mpegts.c => mpegts-mythtv.c} (99%)
 copy mythtv/external/FFmpeg/libavformat/{mpegts.h => mpegts-mythtv.h} (94%)


More information about the mythtv-commits mailing list