diff options
| author | ace20022 <ace20022@ymail.com> | 2013-03-20 14:03:24 +0100 |
|---|---|---|
| committer | ace20022 <ace20022@ymail.com> | 2013-03-20 14:03:24 +0100 |
| commit | b60f700a2c7db27da227fedf4ac1a3a775ba2459 (patch) | |
| tree | 7f0de6f0bd860a974bcbb907e938978a763e28ed /lib/libdvd | |
| parent | 93e562f499586b15a4e6ea0ab4adaebfa02d0ef1 (diff) | |
[Fix] Correct the audio format recognition.
Diffstat (limited to 'lib/libdvd')
| -rw-r--r-- | lib/libdvd/libdvdnav/src/dvdnav/dvd_types.h | 13 | ||||
| -rw-r--r-- | lib/libdvd/patches/libdvdnav_correct_audio_format_enum.diff | 23 |
2 files changed, 29 insertions, 7 deletions
diff --git a/lib/libdvd/libdvdnav/src/dvdnav/dvd_types.h b/lib/libdvd/libdvdnav/src/dvdnav/dvd_types.h index 08b46d385b..eb8121d843 100644 --- a/lib/libdvd/libdvdnav/src/dvdnav/dvd_types.h +++ b/lib/libdvd/libdvdnav/src/dvdnav/dvd_types.h @@ -161,14 +161,13 @@ typedef enum { /* The audio format */ typedef enum { DVD_AUDIO_FORMAT_AC3 = 0, - DVD_AUDIO_FORMAT_MPEG1 = 1, - DVD_AUDIO_FORMAT_MPEG1_DRC = 2, - DVD_AUDIO_FORMAT_MPEG2 = 3, - DVD_AUDIO_FORMAT_MPEG2_DRC = 4, - DVD_AUDIO_FORMAT_LPCM = 5, + DVD_AUDIO_FORMAT_UNKNOWN_1 = 1, + DVD_AUDIO_FORMAT_MPEG = 2, + DVD_AUDIO_FORMAT_MPEG2_EXT = 3, + DVD_AUDIO_FORMAT_LPCM = 4, + DVD_AUDIO_FORMAT_UNKNOWN_5 = 5, DVD_AUDIO_FORMAT_DTS = 6, - DVD_AUDIO_FORMAT_SDDS = 7, - DVD_AUDIO_FORMAT_Other = 8 + DVD_AUDIO_FORMAT_SDDS = 7 } DVDAudioFormat_t; /* Audio language extension */ diff --git a/lib/libdvd/patches/libdvdnav_correct_audio_format_enum.diff b/lib/libdvd/patches/libdvdnav_correct_audio_format_enum.diff new file mode 100644 index 0000000000..2951de71c9 --- /dev/null +++ b/lib/libdvd/patches/libdvdnav_correct_audio_format_enum.diff @@ -0,0 +1,23 @@ +--- libdvdnav-4.2.0/src/dvdnav/dvd_types.h Wed Mar 20 08:51:10 2013 ++++ lib/libdvd/libdvdnav/src/dvdnav/dvd_types.h Wed Mar 20 12:22:25 2013 +@@ -161,14 +161,13 @@ + /* The audio format */ + typedef enum { + DVD_AUDIO_FORMAT_AC3 = 0, +- DVD_AUDIO_FORMAT_MPEG1 = 1, +- DVD_AUDIO_FORMAT_MPEG1_DRC = 2, +- DVD_AUDIO_FORMAT_MPEG2 = 3, +- DVD_AUDIO_FORMAT_MPEG2_DRC = 4, +- DVD_AUDIO_FORMAT_LPCM = 5, ++ DVD_AUDIO_FORMAT_UNKNOWN_1 = 1, ++ DVD_AUDIO_FORMAT_MPEG = 2, ++ DVD_AUDIO_FORMAT_MPEG2_EXT = 3, ++ DVD_AUDIO_FORMAT_LPCM = 4, ++ DVD_AUDIO_FORMAT_UNKNOWN_5 = 5, + DVD_AUDIO_FORMAT_DTS = 6, +- DVD_AUDIO_FORMAT_SDDS = 7, +- DVD_AUDIO_FORMAT_Other = 8 ++ DVD_AUDIO_FORMAT_SDDS = 7 + } DVDAudioFormat_t; + + /* Audio language extension */ |