diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-07 15:27:05 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-07 15:27:05 +0400 |
| commit | ad4c7ee4cce2e9637a05e5aef01182adb7da856d (patch) | |
| tree | 78e0d645d3bb07bebc6262195e5575e9d510a715 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c | |
| parent | af2a4036ec6a39acb89d82188cd2be2d697c2a84 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2212 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c index f18764303..bcc6e6b8f 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c @@ -843,10 +843,16 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){ s->low_delay= 1;
/* ffdshow custom code (begin) */
- if(avctx->codec_id == CODEC_ID_SVQ3)
- avctx->pix_fmt= PIX_FMT_YUVJ420P;
- else
- avctx->pix_fmt= PIX_FMT_YUV420P;
+ if(s->avctx->codec_id == CODEC_ID_SVQ3) {
+ s->avctx->pix_fmt = PIX_FMT_YUVJ420P;
+ } else {
+ // todo: adjust colorspace handling in ffdshow?
+ //if(s->avctx->color_range == AVCOL_RANGE_JPEG) {
+ // s->avctx->pix_fmt = PIX_FMT_YUVJ420P;
+ //} else {
+ s->avctx->pix_fmt = PIX_FMT_YUV420P;
+ //}
+ }
/* ffdshow custom code (end) */
avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
|