diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-plugins/gnash/files/gnash-0.8.10_p20120903-bytesfmt.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-plugins/gnash/files/gnash-0.8.10_p20120903-bytesfmt.patch')
-rw-r--r-- | www-plugins/gnash/files/gnash-0.8.10_p20120903-bytesfmt.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/www-plugins/gnash/files/gnash-0.8.10_p20120903-bytesfmt.patch b/www-plugins/gnash/files/gnash-0.8.10_p20120903-bytesfmt.patch new file mode 100644 index 00000000000..918be74369f --- /dev/null +++ b/www-plugins/gnash/files/gnash-0.8.10_p20120903-bytesfmt.patch @@ -0,0 +1,32 @@ +commit 80989fcd47d33e30336785422ded17f4c607a113 +Author: Alexis Ballier <aballier@gentoo.org> +Date: Thu Feb 14 17:21:50 2013 -0300 + + Use av_get_bytes_per_sample in SampleFormatToSampleSize (#38333) + + This is more future proof against the addition of sample formats. + + Signed-off-by: Sandro Santilli <strk@keybit.net> + +diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp +index 136cc08..83b1d74 100644 +--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp ++++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp +@@ -646,6 +646,9 @@ MediaParserFfmpeg::seekMedia(boost::int64_t offset, int whence) + boost::uint16_t + MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt) + { ++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(51,4,0) ++ return av_get_bytes_per_sample(fmt); ++#else + switch (fmt) + { + case AV_SAMPLE_FMT_U8: // unsigned 8 bits +@@ -668,6 +671,7 @@ MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt) + default: + return 8; // arbitrary value + } ++#endif + } + + |