Projects
home:davepl
transcode
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 13
View file
transcode.spec
Changed
@@ -186,7 +186,7 @@ %patch1 %patch2 -p1 %patch3 -p1 -%patch20 -p1 +%patch20 -p0 %patch19 -p0 #%%autoreconf
View file
transcode-1.1.7-ffmpeg29.patch
Changed
@@ -1,7 +1,7 @@ -Index: transcode-1.1.7/encode/encode_lavc.c +Index: encode/encode_lavc.c =================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c +--- encode/encode_lavc.c.orig 2019-02-15 09:47:35.265087629 +0200 ++++ encode/encode_lavc.c 2019-02-15 09:50:35.239920062 +0200 @@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL vframe_list_t *vframe) { @@ -126,24 +126,24 @@ if (outframe->video_len < 0) { tc_log_warn(MOD_NAME, "encoder error: size (%i)", -Index: transcode-1.1.7/export/export_ffmpeg.c +Index: export/export_ffmpeg.c =================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c +--- export/export_ffmpeg.c.orig 2019-02-15 09:47:35.265087629 +0200 ++++ export/export_ffmpeg.c 2019-02-15 09:57:02.282565514 +0200 +@@ -252,9 +252,9 @@ int opt_default(const char *opt, const c for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){ /* GLUE: +if */ if (type == AVMEDIA_TYPE_VIDEO) { -- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); +- AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); - if(o2) - ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); -+ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -+ if(o) -+ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); ++ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); ++ if(o) ++ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); /* GLUE: +if */ } } -@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c +@@ -269,7 +269,10 @@ int opt_default(const char *opt, const c if(opt[0] == 'a') ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); else */ if(opt[0] == 'v') @@ -155,7 +155,7 @@ /* GLUE: disabling else if(opt[0] == 's') ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); -@@ -487,10 +490,10 @@ MOD_init +@@ -489,10 +492,10 @@ MOD_init } lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); @@ -169,7 +169,7 @@ enc_buffer = tc_malloc(size); if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { -@@ -1114,7 +1117,7 @@ MOD_init +@@ -1116,7 +1119,7 @@ MOD_init lavc_venc_context->prediction_method = lavc_param_prediction_method; if(is_huffyuv) @@ -178,7 +178,7 @@ else { switch(pix_fmt) -@@ -1123,18 +1126,18 @@ MOD_init +@@ -1125,18 +1128,18 @@ MOD_init case CODEC_RGB: { if(is_mjpeg) @@ -201,7 +201,7 @@ break; } -@@ -1596,6 +1599,8 @@ MOD_encode +@@ -1598,6 +1601,8 @@ MOD_encode int out_size; const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; @@ -210,7 +210,7 @@ if (param->flag == TC_VIDEO) { -@@ -1620,7 +1625,7 @@ MOD_encode +@@ -1622,7 +1627,7 @@ MOD_encode YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, lavc_venc_context->width, lavc_venc_context->height); avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, @@ -219,7 +219,7 @@ lavc_venc_context->height); /* FIXME: can't use tcv_convert (see decode_lavc.c) */ ac_imgconvert(src, IMG_YUV_DEFAULT, -@@ -1650,7 +1655,7 @@ MOD_encode +@@ -1652,7 +1657,7 @@ MOD_encode lavc_venc_context->width, lavc_venc_context->height); avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, @@ -228,7 +228,7 @@ lavc_venc_context->height); ac_imgconvert(src, IMG_YUV422P, lavc_venc_frame->data, IMG_YUV420P, -@@ -1661,7 +1666,7 @@ MOD_encode +@@ -1663,7 +1668,7 @@ MOD_encode case CODEC_RGB: avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, @@ -237,7 +237,7 @@ lavc_venc_context->height); ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, lavc_venc_frame->data, IMG_YUV420P, -@@ -1674,13 +1679,17 @@ MOD_encode +@@ -1676,13 +1681,17 @@ MOD_encode return TC_EXPORT_ERROR; } @@ -258,11 +258,11 @@ if (out_size < 0) { tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); return TC_EXPORT_ERROR; -Index: transcode-1.1.7/import/decode_lavc.c +Index: import/decode_lavc.c =================================================================== ---- transcode-1.1.7.orig/import/decode_lavc.c -+++ transcode-1.1.7/import/decode_lavc.c -@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode) +--- import/decode_lavc.c.orig 2019-02-15 09:47:35.265087629 +0200 ++++ import/decode_lavc.c 2019-02-15 09:50:35.239920062 +0200 +@@ -290,8 +290,8 @@ void decode_lavc(decode_t *decode) // Convert avcodec image to the requested YUV or RGB format switch (lavc_dec_context->pix_fmt) { @@ -273,7 +273,7 @@ // Remove "dead space" at right edge of planes, if any if (picture.linesize[0] != lavc_dec_context->width) { int y; -@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode) +@@ -315,7 +315,7 @@ void decode_lavc(decode_t *decode) pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, lavc_dec_context->width, lavc_dec_context->height); break; @@ -282,7 +282,7 @@ if (picture.linesize[0] != lavc_dec_context->width) { int y; for (y = 0; y < lavc_dec_context->height; y++) { -@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode) +@@ -334,8 +334,8 @@ void decode_lavc(decode_t *decode) pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, lavc_dec_context->width, lavc_dec_context->height); break; @@ -293,7 +293,7 @@ if (picture.linesize[0] != lavc_dec_context->width) { int y; for (y = 0; y < lavc_dec_context->height; y++) { -@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode) +@@ -354,8 +354,8 @@ void decode_lavc(decode_t *decode) pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, lavc_dec_context->width, lavc_dec_context->height); break; @@ -304,11 +304,11 @@ if (picture.linesize[0] != lavc_dec_context->width) { int y; for (y = 0; y < lavc_dec_context->height; y++) { -Index: transcode-1.1.7/import/import_ffmpeg.c +Index: import/import_ffmpeg.c =================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -661,8 +661,8 @@ retry: +--- import/import_ffmpeg.c.orig 2019-02-15 09:47:35.265087629 +0200 ++++ import/import_ffmpeg.c 2019-02-15 09:50:35.239920062 +0200 +@@ -580,8 +580,8 @@ retry: // Convert avcodec image to our internal YUV or RGB format switch (lavc_dec_context->pix_fmt) { @@ -319,7 +319,7 @@ src_fmt = IMG_YUV420P; YUV_INIT_PLANES(src_planes, frame, src_fmt, lavc_dec_context->width, lavc_dec_context->height); -@@ -693,7 +693,7 @@ retry: +@@ -612,7 +612,7 @@ retry: } break; @@ -328,7 +328,7 @@ src_fmt = IMG_YUV411P; YUV_INIT_PLANES(src_planes, frame, src_fmt, lavc_dec_context->width, lavc_dec_context->height); -@@ -721,8 +721,8 @@ retry: +@@ -640,8 +640,8 @@ retry: } break; @@ -339,7 +339,7 @@ src_fmt = IMG_YUV422P; YUV_INIT_PLANES(src_planes, frame, src_fmt, lavc_dec_context->width, lavc_dec_context->height); -@@ -750,8 +750,8 @@ retry: +@@ -669,8 +669,8 @@ retry:
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.