summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-13 15:41:21 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-13 15:41:21 +0000
commitf1df83444269a251ad033400e89107abf2ea6657 (patch)
treef10d767444ad8df4f6d16361c385b29d18966f9b /libmpdemux
parent7a1fe79132f06354b7e17575c0beb8c0913571cf (diff)
downloadmpv-f1df83444269a251ad033400e89107abf2ea6657.tar.bz2
mpv-f1df83444269a251ad033400e89107abf2ea6657.tar.xz
Remove a useless assignment (there is an if just a few lines above
that ensures those two are already equal). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25733 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 9a643911df..2fe6a4465f 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -720,7 +720,7 @@ if (file_format) {
demuxer_t *demux2 = demuxer;
// Move messages to demuxer detection code?
mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
- file_format = demuxer_desc->type = fformat;
+ file_format = fformat;
if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) {
demuxer = demux2;
goto dmx_open;