<html><body><div style="font-family:Calibri, Arial, Helvetica, sans-serif; font-size:12.0pt; line-height:1.3; color:#1F497D"><!-- ##### NINE BODY BEGIN ##### --><div>What about the mpeg-ts demuxer? <br></div><div><br></div><div id="signature-x" style="-webkit-user-select:none; font-family:Calibri, Arial, Helvetica, sans-serif; font-size:12.0pt; color:#1F497D" class = "signature_editor">Get Firefox on Android<br></div><!-- ##### NINE BODY END ##### --></div><div class="quoted_output_body"><div id="quoted_header" class="quoted_header_editor" style="clear:both;"><hr style="border:none; height:1px; color:#E1E1E1; background-color:#E1E1E1;"/><div style="border:none; padding:3.0pt 0cm 0cm 0cm"><span style="font-size:11.0pt;font-family:Calibri, Arial, Helvetica, sans-serif"><b>From:</b> Peter Bennett<br><b>Sent:</b> Saturday, 28 April 2018 22:08<br><b>To:</b> David Engel; Development of MythTV<br><b>Subject:</b> [mythtv] FFmpeg plans<br></span></div></div><br type='attribution'><div id="quoted_body" class="quoted_body_editor"><p dir="ltr">To David and other devs
<br>
<br>
I have separated the MythTV configure from the FFmpeg configure so that
<br>
they no longer need to be merged when bringing in new FFmpeg versions.
<br>
see ticket https://code.mythtv.org/trac/ticket/13259 . I will commit
<br>
this to master shortly, once I see that no compile errors caused by this
<br>
come from the build slaves and my testing is all successful.
<br>
<br>
I would like to propose that we incorporate FFmpeg master branch into
<br>
MythTV instead of periodically merging release branches. Also I would
<br>
like to merge the FFmpeg git into ours, so that bringing in FFmpeg
<br>
updates becomes a git pull operation. I am not a git expert but I think
<br>
this should work:
<br>
<br>
1. Delete mythtv/external/FFmpeg in mythtv
<br>
From git root:
<br>
git rm -r mythtv/external/FFmpeg
<br>
<br>
2. Create a subtree of FFmpeg master
<br>
From git root:
<br>
git subtree add -P mythtv/external/FFmpeg
<br>
https://github.com/FFmpeg/FFmpeg.git master [--squash]
<br>
<br>
3. Apply our FFmpeg customizations and commit them.
<br>
<br>
4. Later, when we want to pull subsequent FFmpeg updates, run this
<br>
From git root
<br>
git subtree pull -P mythtv/external/FFmpeg
<br>
https://github.com/FFmpeg/FFmpeg.git master [--squash]
<br>
<br>
I will test this in the ffmpeg-resync branch first to make sure it all
<br>
works.
<br>
<br>
Notes: Many articles recommend the --squash flag to suppress importing
<br>
the history of the other project. Does anybody have opinions about this?
<br>
<br>
See
<br>
https://www.atlassian.com/blog/git/alternatives-to-git-submodule-git-subtree
<br>
and man git-subtree.
<br>
<br>
It is recommended but not necessary to separate commits to FFmpeg from
<br>
commits to the rest of the system. This is mainly in case you need to
<br>
submit updates back to the main FFmpeg repository, which we would not
<br>
likely be doing.
<br>
<br>
Please let me have your opinions or comments on this. Also, let me know
<br>
if I have missed something in git that may prevent this from working
<br>
correctly.
<br>
<br>
Peter
<br>
<br>
<br>
_______________________________________________
<br>
mythtv-dev mailing list
<br>
mythtv-dev@mythtv.org
<br>
http://lists.mythtv.org/mailman/listinfo/mythtv-dev
<br>
http://wiki.mythtv.org/Mailing_List_etiquette
<br>
MythTV Forums: https://forum.mythtv.org
<br>
</p>
</div></div></div></body></html>