diff options
author | Casimir666 <casimir666@users.sourceforge.net> | 2009-08-26 22:15:28 +0400 |
---|---|---|
committer | Casimir666 <casimir666@users.sourceforge.net> | 2009-08-26 22:15:28 +0400 |
commit | cfa1f5dc269a5968efaeea61610a06856dffc40f (patch) | |
tree | c8ea12f989165f8bb5ba25a591b4fb3532e926ff /src/filters/transform/mpcvideodec/ffmpeg | |
parent | f8ef58ca9508153952db2057722eead66f6f4041 (diff) |
Changed : binary renamed to mpc-hc.exe and mpc-hc64.exe (better compatibility with Windows Error Reporting)
Changed : Authors list updated
Fixed : macroblocks with some XVid video
Fixed : crash with some Real Video (resolution change)
Fixed : Broken DXVA on G45 with thread number greater than 1
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1247 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/mpcvideodec/ffmpeg')
-rw-r--r-- | src/filters/transform/mpcvideodec/ffmpeg/libavcodec/mpegvideo.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/mpegvideo.c b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/mpegvideo.c index 24dd7ecbd..4ab2f2316 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/mpegvideo.c +++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/mpegvideo.c @@ -461,17 +461,15 @@ av_cold int MPV_common_init(MpegEncContext *s) yc_size = y_size + 2 * c_size;
/* convert fourcc to upper case */
- // ==> Start patch MPC
- s->codec_tag= _toupper( s->avctx->codec_tag &0xFF)
- + (_toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 )
- + (_toupper((s->avctx->codec_tag>>16)&0xFF)<<16)
- + (_toupper((s->avctx->codec_tag>>24)&0xFF)<<24);
-
- s->stream_codec_tag= _toupper( s->avctx->stream_codec_tag &0xFF)
- + (_toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 )
- + (_toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16)
- + (_toupper((s->avctx->stream_codec_tag>>24)&0xFF)<<24);
- // <== End patch MPC
+ s->codec_tag= toupper( s->avctx->codec_tag &0xFF)
+ + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 )
+ + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16)
+ + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24);
+
+ s->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF)
+ + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 )
+ + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16)
+ + (toupper((s->avctx->stream_codec_tag>>24)&0xFF)<<24);
s->avctx->coded_frame= (AVFrame*)&s->current_picture;
|