History

avformat/dvdvideodec: open subdemuxer after initializing IFO headers

It is wasteful to open the subdemuxer if an error occurs while initializing streams or reading IFO headers.

Marth64 committed 2 years ago

Commit a2c57e21 parent 60434b41 file · +8 −10Browse files

Unified · Split

libavformat/dvdvideodec.c+8−10
@@ -1565,9 +1565,9 @@ static int dvdvideo_read_header(AVFormatContext *s) · 1564 unmodified lines
15651565 if ((ret = dvdvideo_ifo_open(s)) < 0 ||
15661566 (c->opt_preindex && (ret = dvdvideo_chapters_setup_preindex(s)) < 0) ||
15671567 (ret = dvdvideo_menu_open(s, &c->play_state)) < 0 ||
1568− (ret = dvdvideo_subdemux_open(s)) < 0 ||
15691568 (ret = dvdvideo_video_stream_setup(s)) < 0 ||
1570− (ret = dvdvideo_audio_stream_add_all(s)) < 0)
1569+ (ret = dvdvideo_audio_stream_add_all(s)) < 0 ||
1570+ (ret = dvdvideo_subdemux_open(s)) < 0)
15711571 return ret;
15721572
15731573 return 0;
@@ -1599,16 +1599,14 @@ static int dvdvideo_read_header(AVFormatContext *s) · 25 unmodified lines
15991599 if (!c->opt_pgc && c->opt_preindex && (ret = dvdvideo_chapters_setup_preindex(s)) < 0)
16001600 return ret;
16011601
1602− if ((ret = dvdvideo_play_open(s, &c->play_state)) < 0 ||
1603− (ret = dvdvideo_subdemux_open(s)) < 0 ||
1604− (ret = dvdvideo_video_stream_setup(s)) < 0 ||
1605− (ret = dvdvideo_audio_stream_add_all(s)) < 0 ||
1606− (ret = dvdvideo_subp_stream_add_all(s)) < 0)
1602+ if ((ret = dvdvideo_play_open(s, &c->play_state)) < 0 ||
1603+ (!c->opt_pgc && !c->opt_preindex && (ret = dvdvideo_chapters_setup_simple(s)) < 0) ||
1604+ (ret = dvdvideo_video_stream_setup(s)) < 0 ||
1605+ (ret = dvdvideo_audio_stream_add_all(s)) < 0 ||
1606+ (ret = dvdvideo_subp_stream_add_all(s)) < 0 ||
1607+ (ret = dvdvideo_subdemux_open(s)) < 0)
16071608 return ret;
16081609
1609− if (!c->opt_pgc && !c->opt_preindex)
1610− return dvdvideo_chapters_setup_simple(s);
1611−
16121610 return 0;
16131611 }
16141612

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t