diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
tree | a838e509fdc2468220466e6337097b3ef590b00c /TOOLS/movinfo.c | |
parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'TOOLS/movinfo.c')
-rw-r--r-- | TOOLS/movinfo.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/TOOLS/movinfo.c b/TOOLS/movinfo.c index 73849b24a7..a021dc78bb 100644 --- a/TOOLS/movinfo.c +++ b/TOOLS/movinfo.c @@ -26,28 +26,28 @@ static char *atom2human_type(int type) { switch (type) { - case 0x766F6F6D: return ("Information sections"); /* moov */ - case 0x6468766D: return ("Movie header"); /* mvhd */ - case 0x6169646D: return ("Media stream"); /* mdia */ - case 0x64686D76: return ("Video media header"); /* vmhd */ - case 0x64686D73: return ("Sound media header"); /* smhd */ - case 0x6468646D: return ("Media header"); /* mdhd */ - case 0x666E696D: return ("Media information"); /* minf */ - case 0x726C6468: return ("Handler reference"); /* hdlr */ - case 0x6B617274: return ("New track (stream)"); /* trak */ - case 0x75716D72: return ("rmqu"); - case 0x65657266: return ("free"); - case 0x64686B74: return ("Track header"); /* tkhd */ - case 0x61746475: return ("User data"); /* udta */ - case 0x7461646D: return ("Movie data"); /* mdat */ - case 0x6C627473: return ("Sample information table"); /* stbl */ - case 0x64737473: return ("Sample description"); /* stsd */ - case 0x6F637473: return ("Chunk offset table"); /* stco */ - case 0x73747473: return ("Sample time table"); /* stts */ - case 0x63737473: return ("Sample->Chunk mapping table"); /* stsc */ - case 0x7A737473: return ("Sample size table"); /* stsz */ + case 0x766F6F6D: return "Information sections"; /* moov */ + case 0x6468766D: return "Movie header"; /* mvhd */ + case 0x6169646D: return "Media stream"; /* mdia */ + case 0x64686D76: return "Video media header"; /* vmhd */ + case 0x64686D73: return "Sound media header"; /* smhd */ + case 0x6468646D: return "Media header"; /* mdhd */ + case 0x666E696D: return "Media information"; /* minf */ + case 0x726C6468: return "Handler reference"; /* hdlr */ + case 0x6B617274: return "New track (stream)"; /* trak */ + case 0x75716D72: return "rmqu"; + case 0x65657266: return "free"; + case 0x64686B74: return "Track header"; /* tkhd */ + case 0x61746475: return "User data"; /* udta */ + case 0x7461646D: return "Movie data"; /* mdat */ + case 0x6C627473: return "Sample information table"; /* stbl */ + case 0x64737473: return "Sample description"; /* stsd */ + case 0x6F637473: return "Chunk offset table"; /* stco */ + case 0x73747473: return "Sample time table"; /* stts */ + case 0x63737473: return "Sample->Chunk mapping table"; /* stsc */ + case 0x7A737473: return "Sample size table"; /* stsz */ } - return("unknown"); + return "unknown"; } #define S_NONE 0 |