[mythtv] ffmpeg pull requests

Peter Bennett pb.mythtv at gmail.com
Mon Jun 13 13:33:55 UTC 2022


On 6/12/22 21:08, Scott Theisen wrote:
> New plan:
> 1. https://github.com/MythTV/mythtv/pull/416 ffmpeg cleanup which 
> includes:
> 1.1a. https://github.com/MythTV/mythtv/pull/568 stylistic change
> 1.1b. https://github.com/MythTV/mythtv/pull/565 lavc/utils-mythtv.c
> 1.1c. https://github.com/MythTV/mythtv/pull/576 Miscellaneous MythTV 
> changes
> 1.1z. https://github.com/MythTV/mythtv/pull/557 ByteReader
>
> 1.2. https://github.com/MythTV/mythtv/pull/577 BitReader (depends on 
> 1z only)
> 1.2a. test bitreader independently? I'm not sure how.
>
> 1.3. ffmpeg-cleanup also includes av_disposition which is the first 
> commit inhttps://github.com/MythTV/FFmpeg/pull/4 and the second 
> mpegts-mythtv.h harmonize commit (in reverse order for some unknown 
> reason)
>
> 2. test new FFmpeg cleanup
>
> 3. merge FFmpeg cleanup into master
>
> 4. apply the harmonize commits to a MythTV branch (I'll rebase 
> https://github.com/MythTV/mythtv/pull/524 once the cleanup commits are 
> merged.)
>
> 5. Test the harmonize branch, especially with DSMCC/MHEG, which I 
> couldn't test.
>
> 6. apply the harmonize commits to FFmpeg 
> https://github.com/MythTV/FFmpeg/pull/4
>
> 7. Apply FFmpeg commits until version 5.0
>
> 8.  copy FFmpeg 5.0 into mythtv
>
> 9. test FFmpeg 5.0
>
> Scott

Thanks for rebasing that.

I recreated devel/ffmpeg-sync from master and ran step 1 (pull #416). 
There were 66 commits applied successfully. I have pushed it, so you can 
look at it.

50 of these commits updated files in external/FFmpeg.

Do you have a FFmpeg pull request that makes these changes in the 
mythtv/FFmpeg repository? How will we get them to MythTV/FFmpeg?

I prefer to keep commits that update FFmpeg separate from ones that 
don't, because of the separate FFmpeg repository we have. Are there any 
of these that update FFmpeg files as well as MythTV files?

Below is the list of 50 commits that update FFmpeg files.

Peter

* beba76345e 2022/06/12 Scott Theisen : mpegts-mythtv.c: export 
disposition from ISO_639_LANGUAGE_DESCRIPTOR
* 3643c1f568 2022/06/12 Scott Theisen : mpegts-mythtv.h: harmonize with 
mpegts.h
* 5e2fa1a249 2022/06/12 Scott Theisen : lavf/os_support.h: remove MythTV 
customization
* e58a539d4c 2022/06/12 Scott Theisen : libavformat/utils.c: silence 
final MythTV warning
* f19cdb7486 2022/06/12 Scott Theisen : libavformat/utils.c: 
av_remove_stream() #if 0 the entire if else ladder
* 03716b41ef 2022/06/12 Scott Theisen : FFmpeg: remove now unecessary 
added exports
* 1d838b84d4 2022/06/12 ulmus-scott   : libavformat/mpegts-mythtv.c: 
move MythTV only stuff first
* 5f70573945 2022/06/12 ulmus-scott   : libavformat/mpegts-mythtv.c: 
silence -Wdiscarded-qualifiers
* f07b4395cf 2022/06/12 ulmus-scott   : libavformat/mpegts-mythtv.c: 
silence -Wunused-function
* a6f7598cc0 2022/06/12 ulmus-scott   : libavformat/mpegts-mythtv.c: 
silence -Wundef
* 95478bb1a0 2022/06/12 ulmus-scott   : libavformat/mpegts-mythtv.c: 
silence -Wunused-variable
* 7e8ce4fd29 2022/06/12 ulmus-scott   : libavformat/mpegts-mythtv.c: 
silence -Wformat
* 54ff5c1b34 2022/06/12 ulmus-scott   : lavf/mpegts-mythtv.c: silence 
-Wdeclaration-after-statement
* d0dc818304 2022/06/12 ulmus-scott   : libavcodec/mpeg12dec.c: silence 
-Wunused-variable from MythTV modification
* fc71518615 2022/06/12 ulmus-scott   : lavf/utils.c: silence 
-Wdeclaration-after-statement
* a4aecdb3b9 2022/06/12 ulmus-scott   : lavf: export 
flush_packet_queue() as mythtv_flush_packet_queue()
* d70a5312a6 2022/06/12 ulmus-scott   : lavf: merge utils-mythtv.c back 
into utils.c
* fc12adf015 2022/06/12 ulmus-scott   : mpegts-mythtv.h: don't expose 
mpegts_remove_stream()
* 89161f077e 2022/06/12 ulmus-scott   : lavc/mpegaudio_parser.c: revert 
MythTV workaround
* 1fd4faf9a7 2022/06/12 ulmus-scott   : revert 'MythTV: class is a 
reserved keyword in C++'
* fe732c2fd0 2022/06/12 ulmus-scott   : Revert "libavcodec/internal.h: 
fix compilation with MSVC"
* 90594dd7e8 2022/06/12 ulmus-scott   : ffmpeg: trim trailing whitespace
* 5809a6601d 2022/06/12 ulmus-scott   : lavf: remove unused MythTV 
addition build_index
* e8f0a551f1 2022/06/12 ulmus-scott   : revert MythTV 'DVB Subtitles: 
Fix display of subs with no display segment.'
* be1066c55b 2022/06/12 ulmus-scott   : ffmpeg lavf/mpeg.c: fix indentation
* 1199f83ccd 2022/06/12 ulmus-scott   : fixup lavf/utils-mythtv.c: 
remove unused code, don't expose unused symbols
* 6aca122f25 2022/06/12 ulmus-scott   : fixup lavf MHEG changes: remove 
unused got_frame
* 024ab27e2b 2022/06/12 ulmus-scott   : fixup dvbsubdec.c: remove unused 
variables
* 04aeed5976 2022/06/12 ulmus-scott   : Revert "lavf/utils.c: don't 
compile some debug log messages"
* a85004ff21 2022/06/12 ulmus-scott   : revert unnecessary null check in 
lavf/utils.c
* 9b734965dd 2022/06/12 ulmus-scott   : fixup PMT patch lavf/utils.c
* 58d6aad281 2022/06/12 ulmus-scott   : silence mpegts-mythtv.c warning: 
mpegts_probe -Wincompatible-pointer-types
* 539cf243c2 2022/06/12 ulmus-scott   : Revert "MythTV: suppress errors 
from old .nuv files"
* 29c6e92dda 2022/06/12 ulmus-scott   : Revert "libavcodec/mpeg4videodec.c"
* 706ec001b8 2022/06/12 ulmus-scott   : Revert "libavformat/mov.c: 
increase allowed time error"
* e4821bed24 2022/06/12 ulmus-scott   : Initial mpegts-mythtv.h 
harmonization
* 33a8f40686 2022/06/12 ulmus-scott   : lavc/mpegvideo.h: revert 
unnecessary changes
* ad41512faa 2022/06/12 ulmus-scott   : lavc/dvbsubdec.c: remove 
redundant conditional statements
* ed56ddaac5 2022/06/12 ulmus-scott   : lpp: revert change to Makefile
* 649aa1eba5 2022/06/12 ulmus-scott   : lpp: revert unnecessary MythTV 
cpu autodetect
* 7276cd47aa 2022/06/12 ulmus-scott   : lpp: revert unnecessary added 
include
* c2bdf57b5d 2022/06/12 ulmus-scott   : lavf: move MythTV added define 
to the only file using it
* 9af1570bce 2022/06/12 ulmus-scott   : lavf/utils.c: remove unused 
extern declarations
* f8836c1a11 2022/06/12 Scott Theisen : lavc/get_bits.h and golomb.h: 
revert MythTV changes
* e61b5d5a6b 2022/06/12 Scott Theisen : lavc/avcodec.h: remove no longer 
used MythTV function export
* 4a6144c8c5 2022/06/12 ulmus-scott   : ffmpeg codec_desc.c: remove 
duplicate dvd nav packet
* d1cd1937c2 2022/06/12 ulmus-scott   : remove (now unused) 
FFmpeg/libavcodec/utils-mythtv.c
* 64a3c60ee5 2022/06/12 ulmus-scott   : replace ff_codec_id_string() 
with avcodec_get_name()
* 1c346ec1ac 2022/06/12 ulmus-scott   : add MPEG2VBI and DVB_VBI to 
codec_desc.c
* da498f9f05 2022/06/12 ulmus-scott   : remove FFmpeg addition 
ff_codec_type_string()





More information about the mythtv-dev mailing list