Skip to content

Fix decoding of the last MP3 frame#1183

Merged
daschuer merged 1 commit intomixxxdj:2.1from
uklotzde:libmad_last_mp3_frame
Feb 11, 2017
Merged

Fix decoding of the last MP3 frame#1183
daschuer merged 1 commit intomixxxdj:2.1from
uklotzde:libmad_last_mp3_frame

Conversation

@uklotzde
Copy link
Copy Markdown
Contributor

@uklotzde uklotzde commented Feb 11, 2017

Another fix for the upcoming release.

The code of SoundSourceMp3 is still ugly, but I don't want to rewrite this once again, even if mpg123 is more popular than libmad nowadays.

@sblaisot
Copy link
Copy Markdown
Member

If this is for the next release, you need to target the 2.1 branch instead of Master.

@uklotzde uklotzde changed the base branch from master to 2.1 February 11, 2017 13:38
@daschuer
Copy link
Copy Markdown
Member

It is correct, that we have a already a 2.1 branch, but both are currently still in sync.
Since the merge direction is master -> 2.1 all PRs can continue to target master this changes once we we add the first master only PR.

@daschuer
Copy link
Copy Markdown
Member

Test passed! Well done, thank you.

@daschuer daschuer merged commit 24c2212 into mixxxdj:2.1 Feb 11, 2017
@uklotzde uklotzde deleted the libmad_last_mp3_frame branch February 14, 2017 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants