Skip to content

Commit

Permalink
Merge pull request xbmc#26037 from thexai/VideoPicture-cleanup
Browse files Browse the repository at this point in the history
DVDVideoCodec: remove some not necessary definitions in .cpp
  • Loading branch information
thexai authored Dec 3, 2024
2 parents 3c88ff0 + e650336 commit fd81c97
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
6 changes: 0 additions & 6 deletions xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
//******************************************************************************
// VideoPicture
//******************************************************************************

VideoPicture::VideoPicture() = default;

VideoPicture::~VideoPicture()
{
if (videoBuffer)
Expand Down Expand Up @@ -121,6 +118,3 @@ bool VideoPicture::IsSameParams(const VideoPicture& pic) const
this->color_transfer == pic.color_transfer && this->hdrType == pic.hdrType &&
CompareDisplayMetadata(pic) && CompareLightMetadata(pic);
}

VideoPicture::VideoPicture(VideoPicture const&) = default;
VideoPicture& VideoPicture::operator=(VideoPicture const&) = default;
6 changes: 3 additions & 3 deletions xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class CSetting;
struct VideoPicture
{
public:
VideoPicture();
VideoPicture() = default;
~VideoPicture();
VideoPicture& CopyRef(const VideoPicture &pic);
VideoPicture& SetParams(const VideoPicture &pic);
Expand Down Expand Up @@ -80,8 +80,8 @@ struct VideoPicture
unsigned int iDisplayHeight; //< height of the picture without black bars

private:
VideoPicture(VideoPicture const&);
VideoPicture& operator=(VideoPicture const&);
VideoPicture(VideoPicture const&) = default;
VideoPicture& operator=(VideoPicture const&) = default;

bool CompareDisplayMetadata(const VideoPicture& pic) const;
bool CompareLightMetadata(const VideoPicture& pic) const;
Expand Down

0 comments on commit fd81c97

Please # to comment.