Mailing List Archive

Author: Gavin Hurlbut <ghurlbut@mythtv.org>
Change Date: 2011-05-04T10:57:13-07:00
Push Date: 2011/05/04 10:57:26 -0700
Repository: mythtv
Branch: new-logging
New Revision: 8ac03c9cf2cce6c9d4c556a1ace8a4fbedbb7aa6
Changeset: https://github.com/MythTV/mythtv/commit/8ac03c9cf

Log:

Merge branch 'master' into new-logging

Conflicts:
mythtv/libs/libmythtv/ThreadedFileWriter.cpp

Modified:

mythtv/configure
mythtv/external/FFmpeg/libavcodec/myth_utils.c
mythtv/libs/libmythbluray/bluray.c
mythtv/libs/libmythbluray/hdmv/hdmv_vm.c
mythtv/libs/libmythbluray/hdmv/hdmv_vm.h
mythtv/libs/libmythbluray/register.c
mythtv/libs/libmythtv/ThreadedFileWriter.cpp
mythtv/libs/libmythtv/avformatdecoder.cpp
mythtv/libs/libmythtv/avformatdecoder.h
mythtv/libs/libmythtv/decoderbase.h
mythtv/libs/libmythtv/fileringbuffer.cpp
mythtv/libs/libmythtv/libmythtv.pro
mythtv/libs/libmythtv/mythplayer.cpp
mythtv/libs/libmythtv/mythplayer.h
mythtv/libs/libmythtv/ringbuffer.cpp
mythtv/libs/libmythtv/subtitlescreen.cpp
mythtv/libs/libmythtv/subtitlescreen.h
mythtv/libs/libmythtv/tv_actions.h
mythtv/libs/libmythtv/tv_play.cpp

_______________________________________________
mythtv-firehose mailing list
mythtv-firehose@mythtv.org
http://www.mythtv.org/mailman/listinfo/mythtv-firehose