ffmpeg patches
Torsten Jager <[email protected]> Sat, 07 Dec 2013 16:30:42 +0100
| Newsgroups | gmane.comp.video.xine.devel |
|---|---|
| Message-ID | <[email protected]> |
Hello Sir Michael Niedermayer of ffmpeg ;-) Please apologize this message path. I dont have internet at home, and joining another list _will_ blow out my mail routine so far. You told me you are listening here too so what. This is what I use here a lot: ffmpeg-2.1_1.tj.diff ffmpeg-2.1_2.tj.diff Torsten ------------------------------------------------------------------------------ Sponsored by Intel(R) XDK Develop, test and display web and hybrid apps with a single code base. Download it for free now! http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk _______________________________________________ xine-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/xine-devel
ffmpeg-2.1_1.tj.diff
(text/x-patch, 1 KB)
# Author: Torsten Jager <[email protected]> configure: Detect static only libx264.a. --- ffmpeg-2.1/configure 2013-10-28 01:58:04.000000000 +0100 +++ ffmpeg-2.1/configure 2013-11-07 21:29:00.000000000 +0100 @@ -4285,7 +4285,7 @@ enabled libvpx && { enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; } enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx" -lvpx || disable libvpx_vp9_encoder; } } enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack -enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 && +enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -ldl && { check_cpp_condition x264.h "X264_BUILD >= 118" || die "ERROR: libx264 must be installed and version must be >= 0.118."; } enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
ffmpeg-2.1_2.tj.diff
(text/x-patch, 1.2 KB)
# Author: Torsten Jager <[email protected]> libx264: Pass colorspace info to VUI. --- ffmpeg-2.1/libavcodec/libx264.c 2013-10-28 01:58:05.000000000 +0100 +++ ffmpeg-2.1/libavcodec/libx264.c 2013-12-07 11:54:00.000000000 +0100 @@ -535,9 +535,19 @@ static av_cold int X264_init(AVCodecCont x4->params.i_slice_count = avctx->slices; + /* TJ. */ x4->params.vui.b_fullrange = avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ444P; + avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || + avctx->color_range == AVCOL_RANGE_JPEG; + + if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED) + x4->params.vui.i_colmatrix = avctx->colorspace; + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) + x4->params.vui.i_colorprim = avctx->color_primaries; + if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED) + x4->params.vui.i_transfer = avctx->color_trc; + /* /TJ. */ if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; Torsten