summaryrefslogtreecommitdiff
path: root/src/libffmpeg
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-01-04 22:26:28 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-01-04 22:26:28 +0000
commitb831c841f570dde9092dfbbf1fc4a40f8b5c301c (patch)
tree49eb53dbbc44ea6ab82042f1f0ae471fdc7141c9 /src/libffmpeg
parent5d919982e44bae40e8f9f0c57713b870e7a96582 (diff)
downloadxine-lib-b831c841f570dde9092dfbbf1fc4a40f8b5c301c.tar.gz
xine-lib-b831c841f570dde9092dfbbf1fc4a40f8b5c301c.tar.bz2
The most important change is the smallest:
* add a small delay before enabling zoom mode, since the card gets confused when we activate zoom mode before the first frame (that's also what the ChangeLog entry accounts for) Then some less important changes: * give a hint about sync mode to the SCR plugin to properly recover the mode when resuming from pause mode * refactor the enhanced mode handling out of the MPEG encoders into video out * inline some decoder functions, because they are only used once anyway * some additional cleanup CVS patchset: 5996 CVS date: 2004/01/04 22:26:28
Diffstat (limited to 'src/libffmpeg')
-rw-r--r--src/libffmpeg/xine_encoder.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index 7c92223e4..3c87a62fb 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_encoder.c,v 1.9 2003/12/05 15:54:59 f1rmb Exp $
+ * $Id: xine_encoder.c,v 1.10 2004/01/04 22:26:29 mroi Exp $
*/
/* mpeg encoders for the dxr3 video out plugin. */
@@ -199,15 +199,6 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
return 0;
}
- /* set the dxr3 playmode */
- if (drv->enhanced_mode) {
- em8300_register_t regs;
- regs.microcode_register = 1;
- regs.reg = 0;
- regs.val = MVCOMMAND_SYNC;
- ioctl(drv->fd_control, EM8300_IOCTL_WRITEREG, &regs);
- }
-
return 1;
}