mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-01 03:57:05 -08:00
Robin H. Johnson
56bd759df1
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
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
diff -aurN a/ffmpeg_movie.c b/ffmpeg_movie.c
|
|
--- a/ffmpeg_movie.c 2015-06-22 19:46:01.220498329 -0400
|
|
+++ b/ffmpeg_movie.c 2015-06-22 20:44:26.802671398 -0400
|
|
@@ -697,7 +697,16 @@
|
|
return rate;
|
|
}
|
|
|
|
-#if LIBAVCODEC_BUILD > 4753
|
|
+#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
|
|
+ if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
|
|
+ if (st->avg_frame_rate.den && st->avg_frame_rate.num) {
|
|
+ rate = av_q2d(st->avg_frame_rate);
|
|
+ } else {
|
|
+ rate = 1 / av_q2d(GET_CODEC_FIELD(st->codec, time_base));
|
|
+ }
|
|
+ }
|
|
+ return (float)rate;
|
|
+#elif LIBAVCODEC_BUILD > 4753
|
|
if (GET_CODEC_FIELD(st->codec, codec_type) == AVMEDIA_TYPE_VIDEO){
|
|
if (st->r_frame_rate.den && st->r_frame_rate.num) {
|
|
rate = av_q2d(st->r_frame_rate);
|
|
@@ -980,14 +980,22 @@
|
|
if (p) {
|
|
codec_name = p->name;
|
|
#ifdef FF_API_SUB_ID
|
|
+#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
|
|
+ if (decoder_ctx->codec_id == AV_CODEC_ID_MP3) {
|
|
+#else
|
|
if (decoder_ctx->codec_id == CODEC_ID_MP3) {
|
|
+#endif
|
|
if (decoder_ctx->sub_id == 2)
|
|
codec_name = "mp2";
|
|
else if (decoder_ctx->sub_id == 1)
|
|
codec_name = "mp1";
|
|
}
|
|
#endif
|
|
+#if LIBAVCODEC_BUILD > 3604480 /* libav-10 */
|
|
+ } else if (decoder_ctx->codec_id == AV_CODEC_ID_MPEG2TS) {
|
|
+#else
|
|
} else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) {
|
|
+#endif
|
|
/* fake mpeg2 transport stream codec (currently not registered) */
|
|
codec_name = "mpeg2ts";
|
|
} else if (decoder_ctx->codec_name[0] != '\0') {
|