May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34888 - trunk/osdep/mplayer.rc
by reimar 06 May '12

06 May '12

Author: reimar Date: Sun May 6 14:24:09 2012 New Revision: 34888 Log: Update copyright year in Windows .rc file. Modified: trunk/osdep/mplayer.rc Modified: trunk/osdep/mplayer.rc ============================================================================== --- trunk/osdep/mplayer.rc Sun May 6 11:08:12 2012 (r34887) +++ trunk/osdep/mplayer.rc Sun May 6 14:24:09 2012 (r34888) @@ -36,7 +36,7 @@ FILETYPE VFT_APP VALUE "FileDescription", "MPlayer - Movie Player\000" VALUE "FileVersion",VERSION VALUE "InternalName", "Counter Counter\000" - VALUE "LegalCopyright", " (C) 2000-2010 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team\000" //VALUE "LegalTrademarks"," \000"; VALUE "OriginalFilename", "mplayer.exe\000" VALUE "ProductName", "MPlayer - The Movie Player\000"

1 0

r34887 - trunk/mixer.c
by reimar 06 May '12

06 May '12

Author: reimar Date: Sun May 6 11:08:12 2012 New Revision: 34887 Log: Avoid repeating mixer error messages from ao. This avoids continuous printing of e.g. "[AO_ALSA] Unable to find simple control 'PCM',0." even after MPlayer switched to software volume control. Modified: trunk/mixer.c Modified: trunk/mixer.c ============================================================================== --- trunk/mixer.c Sun May 6 10:44:28 2012 (r34886) +++ trunk/mixer.c Sun May 6 11:08:12 2012 (r34887) @@ -89,6 +89,7 @@ void mixer_setvolume(mixer_t *mixer, flo mp_msg(MSGT_GLOBAL, MSGL_ERR, MSGTR_NoVolume); return; } + soft_vol = 1; } } }

2 1

r34886 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 06 May '12

06 May '12

Author: reimar Date: Sun May 6 10:44:28 2012 New Revision: 34886 Log: Fix A-V desync with skipframe and H.264. This will however cause desync when skipframe is used on PAFF H.264 content without correct-pts. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Wed May 2 23:15:07 2012 (r34885) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun May 6 10:44:28 2012 (r34886) @@ -867,7 +867,8 @@ static mp_image_t *decode(sh_video_t *sh //-- if(!got_picture) { - if (avctx->codec->id == CODEC_ID_H264) + if (avctx->codec->id == CODEC_ID_H264 && + skip_frame == AVDISCARD_NONE) return &mpi_no_picture; // H.264 first field only else return NULL; // skipped image

1 0

r34885 - trunk/libmpcodecs/ad_mpg123.c
by iive 02 May '12

02 May '12

Author: iive Date: Wed May 2 23:15:07 2012 New Revision: 34885 Log: Workaround bug in mpg123. In rare cases, after seeking mplayer stops audio playback and would repeat "No stream opened. (code 24)" until next seek. This is caused by bug in mpg123_getformat() that triggers needless reading of next frame, possibly hitting bogus MPG123_NEED_MORE. The function is fixed in mpg123 1.14.0+. This commit however allows older mpg123 versions to work properly in mplayer. Patch by Thomas Orgis, thomas-forum orgis org Modified: trunk/libmpcodecs/ad_mpg123.c Modified: trunk/libmpcodecs/ad_mpg123.c ============================================================================== --- trunk/libmpcodecs/ad_mpg123.c Wed May 2 20:57:24 2012 (r34884) +++ trunk/libmpcodecs/ad_mpg123.c Wed May 2 23:15:07 2012 (r34885) @@ -205,19 +205,6 @@ static void print_header_compact(struct smodes[i->mode]); } -/* return MPG123_OK if decoder is ready to produce output - * the other usual return code would be MPG123_NEED_MORE. */ -static int have_initial_frame(mpg123_handle *mh) -{ - long rate; - int chan, enc; - /* Abusing the format query function. - * It returns MPG123_OK if an intial frame has been parsed. - * It returns MPG123_NEED_MORE if input data is needed. - * Not handing NULL pointers for compatibility with old libmpg123. */ - return mpg123_getformat(mh, &rate, &chan, &enc); -} - /* This tries to extract a requested amount of decoded data. * Even when you request 0 bytes, it will feed enough input so that * the decoder _could_ have delivered something. @@ -283,7 +270,7 @@ static int decode_a_bit(sh_audio_t *sh, * for the loop condition. */ #ifdef AD_MPG123_FRAMEWISE if (!buf) { /* fake call just for feeding to get format */ - ret = have_initial_frame(con->handle); + ret = mpg123_getformat(con->handle, NULL, NULL, NULL); } else { /* This is the decoding. One frame at a time. */ ret = mpg123_replace_buffer(con->handle, buf, count); if (ret == MPG123_OK) @@ -326,8 +313,7 @@ static int reopen_stream(sh_audio_t *sh) /* Open and make sure we have fed enough data to get stream properties. */ if (MPG123_OK == mpg123_open_feed(con->handle) && /* Feed data until mpg123 is ready (has found stream beginning). */ - !decode_a_bit(sh, NULL, 0) && - MPG123_OK == have_initial_frame(con->handle)) { + !decode_a_bit(sh, NULL, 0)) { return 1; } else { mp_msg(MSGT_DECAUDIO, MSGL_ERR, @@ -492,6 +478,8 @@ static int control(sh_audio_t *sh, int c #endif return CONTROL_TRUE; } else { + /* MPlayer ignores this case! It just keeps on decoding. + * So we have to make sure resync never fails ... */ mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 cannot reopen stream for resync.\n"); return CONTROL_FALSE;

1 0

r34884 - trunk/mencoder.c
by reimar 02 May '12

02 May '12

Author: reimar Date: Wed May 2 20:57:24 2012 New Revision: 34884 Log: mencoder: Fix hang with -ovc copy or -ovc frameno. It was introduced in r34860. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Mon Apr 30 12:20:10 2012 (r34883) +++ trunk/mencoder.c Wed May 2 20:57:24 2012 (r34884) @@ -1400,7 +1400,9 @@ if(sh_audio){ if (!frame_data.already_read) { frame_data.in_size=video_read_frame(sh_video,&frame_data.frame_time,&frame_data.start,force_fps); - frame_data.flush = frame_data.in_size < 0 && d_video->eof; + frame_data.flush = frame_data.in_size < 0 && d_video->eof && + mux_v->codec != VCODEC_COPY && + mux_v->codec != VCODEC_FRAMENO; if (frame_data.flush) { frame_data.in_size = 0; frame_data.start = NULL;

1 0