diff options
| author | saintdev <[email protected]> | 2007-04-26 07:57:59 +0000 |
|---|---|---|
| committer | saintdev <[email protected]> | 2007-04-26 07:57:59 +0000 |
| commit | 4c84cb2ff519e4392ea8af0168b57d4ef5d1c4fd (patch) | |
| tree | 717ef22b5d8de11d401d81a76fe2d378a185790a /contrib | |
| parent | c9fa0ecad7aee37b787cd09fc49c3d13fb480a84 (diff) | |
Various fixes:
- Include parsecsv.c in the Jamfile so we can compile the CLI with Jam
- Quiet some compiler warnings in parsecsv.{c,h}
- Check some return values in muxmp4.c and encfaac.c and die gracefully if there is a problem.
- Correctly set the number of audio channels in the stsd atom.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@552 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/patch-mpeg4ip.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/contrib/patch-mpeg4ip.patch b/contrib/patch-mpeg4ip.patch index d025e5750..8a5462c5c 100644 --- a/contrib/patch-mpeg4ip.patch +++ b/contrib/patch-mpeg4ip.patch @@ -600,3 +600,26 @@ diff -Naur mpeg4ip.orig/lib/mp4v2/mp4file.h mpeg4ip.patched/lib/mp4v2/mp4file.h MP4SampleId GetTrackNumberOfSamples(MP4TrackId trackId); +diff -Naur mpeg4ip.orig/lib/mp4v2/atom_mp4a.cpp mpeg4ip.patched/lib/mp4v2/atom_mp4a.cpp +--- mpeg4ip.orig/lib/mp4v2/atom_mp4a.cpp 2007-04-26 01:21:22.000000000 -0600 ++++ mpeg4ip.patched/lib/mp4v2/atom_mp4a.cpp 2007-04-26 01:43:08.000000000 -0600 +@@ -29,7 +29,10 @@ + AddProperty( /* 1 */ + new MP4Integer16Property("dataReferenceIndex")); + +- AddReserved("reserved2", 16); /* 2 */ ++ /* patched by saintdev to allow us to set correct audio information */ ++// AddReserved("reserved2", 16); /* 2 */ ++ AddProperty( /* 2 */ ++ new MP4BytesProperty("reserved2", 16)); + + AddProperty( /* 3 */ + new MP4Integer16Property("timeScale")); +@@ -55,5 +58,6 @@ + m_pProperties[2]->SetReadOnly(false); + ((MP4BytesProperty*)m_pProperties[2])-> + SetValue(reserved2, sizeof(reserved2)); +- m_pProperties[2]->SetReadOnly(true); ++ /* patched by saintdev to allow us to set correct audio information */ ++// m_pProperties[2]->SetReadOnly(true); + } |