Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 570904 - Update libnestegg. r=doublec

Browse Source
This commit is contained in:
Matthew Gregan 2010-09-07 16:54:17 +12:00
parent d9e5428ebc
commit a3a6455c42
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/libnestegg/README_MOZILLA
View File

@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
The git commit ID used was 844b8bc7695e2d60ad7bde3fb5105c0b24304640.
The git commit ID used was 938fbd47a291fa12ea35deffb5bdfd614654d65f.

9
media/libnestegg/include/nestegg.h
View File

@ -154,6 +154,15 @@ void nestegg_destroy(nestegg * context);
@retval -1 Error. */
int nestegg_duration(nestegg * context, uint64_t * duration);
/** Query the tstamp scale of the media stream in nanoseconds.
Timecodes presented by nestegg have been scaled by this value
before presentation to the caller.
@param context Stream context initialized by #nestegg_init.
@param scale Storage for the queried scale factor.
@retval 0 Success.
@retval -1 Error. */
int nestegg_tstamp_scale(nestegg * context, uint64_t * scale);
/** Query the number of tracks in the media stream.
@param context Stream context initialized by #nestegg_init.
@param tracks Storage for the queried track count.

7
media/libnestegg/src/nestegg.c
View File

@ -1513,6 +1513,13 @@ nestegg_duration(nestegg * ctx, uint64_t * duration)
return 0;
}
int
nestegg_tstamp_scale(nestegg * ctx, uint64_t * scale)
{
*scale = get_timecode_scale(ctx);
return 0;
}
int
nestegg_track_count(nestegg * ctx, unsigned int * tracks)
{

17
media/libnestegg/update.sh
View File

@ -9,4 +9,19 @@ cp $1/halloc/src/macros.h src
cp $1/LICENSE .
cp $1/README .
cp $1/AUTHORS .
echo 'Remember to update README_MOZILLA with the version details.'
if [ -d $1/.git ]; then
rev=$(cd $1 && git rev-parse --verify HEAD)
dirty=$(cd $1 && git diff-index --name-only HEAD)
fi
if [ -n "$rev" ]; then
version=$rev
if [ -n "$dirty" ]; then
version=$version-dirty
echo "WARNING: updating from a dirty git repository."
fi
sed -i "/The git commit ID used was/ s/[0-9a-f]\+\(-dirty\)\?\./$version./" README_MOZILLA
else
echo "Remember to update README_MOZILLA with the version details."
fi