[mythtv-commits] mythtv branch master updated by jyavenard. v0.26-pre-439-g5a8db30

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user jyavenard.
       via  5a8db30aee21f416a98fbfac8b0b4022a6f9a912 (commit)
       via  ed69ea820b717cbdfd17ec10c6d78e63f6b6d789 (commit)
      from  cc720810747f2c9ca5ea5cc8769f1ebbeb7a08b5 (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 5a8db30aee21f416a98fbfac8b0b4022a6f9a912
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sat, 2 Jun 2012 00:06:30 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sat, 2 Jun 2012 00:06:49 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5a8db30aee21f416a98fbfac8b0b4022a6f9a912

Loosen test for initial stream alignment before prefetch. We could otherwise end up with a stream with no segment left. So we ensure there's always at least one.
This is required for HLS streams where the backup streams don't match at all (e.g. France24 stream)



commit ed69ea820b717cbdfd17ec10c6d78e63f6b6d789
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 1 Jun 2012 23:58:30 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sat, 2 Jun 2012 00:06:49 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ed69ea820b717cbdfd17ec10c6d78e63f6b6d789

FFmpeg resync to SHA1:f218121a4d79f9aab45526f3d1655ec2cc8de0d1
http://git.videolan.org/?p=ffmpeg.git;a=log;h=f218121a4d79f9aab45526f3d1655ec2cc8de0d1

No conflict



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

Summary of changes:
 mythtv/configure                                   |    4 +-
 mythtv/external/FFmpeg/README.sync                 |    1 +
 mythtv/external/FFmpeg/configure                   |    6 +-
 mythtv/external/FFmpeg/ffmpeg.c                    |    1 +
 mythtv/external/FFmpeg/libavcodec/8svx.c           |    2 +-
 mythtv/external/FFmpeg/libavcodec/dnxhdenc.c       |   16 +-
 mythtv/external/FFmpeg/libavcodec/gif.c            |    5 +
 mythtv/external/FFmpeg/libavcodec/h264.c           |   27 ++-
 mythtv/external/FFmpeg/libavcodec/h264.h           |   12 +-
 mythtv/external/FFmpeg/libavcodec/h264data.h       |    5 -
 mythtv/external/FFmpeg/libavcodec/libmp3lame.c     |    3 +-
 mythtv/external/FFmpeg/libavcodec/mjpegenc.c       |    5 +
 mythtv/external/FFmpeg/libavcodec/mpeg4videodec.c  |    4 +
 mythtv/external/FFmpeg/libavcodec/qdm2.c           |    3 +-
 mythtv/external/FFmpeg/libavcodec/sgienc.c         |    5 +
 mythtv/external/FFmpeg/libavcodec/vp8.c            |   38 ++--
 mythtv/external/FFmpeg/libavfilter/af_amix.c       |   19 +-
 mythtv/external/FFmpeg/libavfilter/bufferqueue.h   |  111 ++++++++++
 mythtv/external/FFmpeg/libavfilter/sink_buffer.c   |    2 +
 mythtv/external/FFmpeg/libavfilter/vf_overlay.c    |  225 +++++++++++++------
 mythtv/external/FFmpeg/libavformat/avio.c          |   13 +-
 mythtv/external/FFmpeg/libavformat/dv.c            |    3 -
 mythtv/external/FFmpeg/libavformat/http.c          |   54 ++++--
 mythtv/external/FFmpeg/libavformat/jacosubdec.c    |    7 +-
 mythtv/external/FFmpeg/libavformat/mxfenc.c        |   14 +-
 .../external/FFmpeg/libavformat/oggparsevorbis.c   |    4 +-
 mythtv/external/FFmpeg/libavformat/tcp.c           |    8 +
 mythtv/external/FFmpeg/libavformat/url.h           |    3 +-
 mythtv/external/FFmpeg/libavutil/avutil.h          |    2 +-
 mythtv/external/FFmpeg/libavutil/log.h             |   18 ++
 mythtv/external/FFmpeg/libswresample/swresample.c  |    6 +-
 mythtv/external/FFmpeg/tests/fate/acodec.mak       |   12 +-
 mythtv/external/FFmpeg/tests/md5.sh                |    2 +-
 mythtv/external/FFmpeg/tests/ref/fate/acodec-ra144 |    4 -
 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp |    2 +-
 35 files changed, 466 insertions(+), 180 deletions(-)
 create mode 100644 mythtv/external/FFmpeg/libavfilter/bufferqueue.h
 delete mode 100644 mythtv/external/FFmpeg/tests/ref/fate/acodec-ra144

--