diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:39:41 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:39:41 +0300 |
commit | 0e0d88ede9c7e9decf4079adcffc7713d4ded210 (patch) | |
tree | 819165655b2b2bc72f4ffa12f4bfec93e6f8bb36 /libmpcodecs | |
parent | c61e57bdd035ba2e151df9cdc7f3186ddf5fcb97 (diff) | |
parent | a564c5a6cc3eeeaa5b271aead5d05b90e6fdb041 (diff) | |
download | mpv-0e0d88ede9c7e9decf4079adcffc7713d4ded210.tar.bz2 mpv-0e0d88ede9c7e9decf4079adcffc7713d4ded210.tar.xz |
Merge svn changes up to r31256
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vd_theora.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index 86fb5dc0dd..5ad3b35691 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -98,7 +98,7 @@ static int init(sh_video_t *sh){ op.packet = extradata + 2; op.b_o_s = 1; if (extradata_size < op.bytes + 2) { - mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Theora header too small\n"); + mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Theora header too small\n"); goto err_out; } extradata += op.bytes + 2; @@ -110,7 +110,7 @@ static int init(sh_video_t *sh){ if ( (errorCode = theora_decode_header (&context->inf, &context->cc, &op)) ) { - mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode); + mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode); goto err_out; } } @@ -187,7 +187,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) errorCode = theora_decode_YUVout (&context->st, &yuv); if (errorCode) { - mp_msg(MSGT_DEMUX,MSGL_ERR,"Theora decode YUVout failed: %i \n", + mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode YUVout failed: %i \n", errorCode); return NULL; } |