generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: remove some useless code

Browse Source 
Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2008-06-16 23:11:02 +00:00
parent 6dfcdc00b3
commit ded4241bb0
2 changed files with 3 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/matroska.h
View File

@@ -182,19 +182,6 @@ typedef enum {
MATROSKA_TRACK_TYPE_CONTROL = 0x20, MATROSKA_TRACK_TYPE_CONTROL = 0x20,
} MatroskaTrackType; } MatroskaTrackType;
typedef enum {
MATROSKA_EYE_MODE_MONO = 0x0,
MATROSKA_EYE_MODE_RIGHT = 0x1,
MATROSKA_EYE_MODE_LEFT = 0x2,
MATROSKA_EYE_MODE_BOTH = 0x3,
} MatroskaEyeMode;
typedef enum {
MATROSKA_ASPECT_RATIO_MODE_FREE = 0x0,
MATROSKA_ASPECT_RATIO_MODE_KEEP = 0x1,
MATROSKA_ASPECT_RATIO_MODE_FIXED = 0x2,
} MatroskaAspectRatioMode;
typedef enum { typedef enum {
MATROSKA_TRACK_ENCODING_COMP_ZLIB = 0, MATROSKA_TRACK_ENCODING_COMP_ZLIB = 0,
MATROSKA_TRACK_ENCODING_COMP_BZLIB = 1, MATROSKA_TRACK_ENCODING_COMP_BZLIB = 1,

57
libavformat/matroskadec.c
View File

@@ -55,7 +55,6 @@ typedef struct Track {
char language[4]; char language[4];
char *codec_id; char *codec_id;
char *codec_name;
unsigned char *codec_priv; unsigned char *codec_priv;
int codec_priv_size; int codec_priv_size;
@@ -80,9 +79,6 @@ typedef struct MatroskaVideoTrack {
uint32_t fourcc; uint32_t fourcc;
MatroskaAspectRatioMode ar_mode;
MatroskaEyeMode eye_mode;
//.. //..
} MatroskaVideoTrack; } MatroskaVideoTrack;
@@ -1153,46 +1149,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
break; break;
} }
/* stereo mode (whether the video has two streams,
* where one is for the left eye and the other for
* the right eye, which creates a 3D-like
* effect) */
case MATROSKA_ID_VIDEOSTEREOMODE: {
uint64_t num;
if ((res = ebml_read_uint(matroska, &id,
&num)) < 0)
break;
if (num != MATROSKA_EYE_MODE_MONO &&
num != MATROSKA_EYE_MODE_LEFT &&
num != MATROSKA_EYE_MODE_RIGHT &&
num != MATROSKA_EYE_MODE_BOTH) {
av_log(matroska->ctx, AV_LOG_INFO,
"Ignoring unknown eye mode 0x%x\n",
(uint32_t) num);
break;
}
videotrack->eye_mode = num;
break;
}
/* aspect ratio behaviour */
case MATROSKA_ID_VIDEOASPECTRATIO: {
uint64_t num;
if ((res = ebml_read_uint(matroska, &id,
&num)) < 0)
break;
if (num != MATROSKA_ASPECT_RATIO_MODE_FREE &&
num != MATROSKA_ASPECT_RATIO_MODE_KEEP &&
num != MATROSKA_ASPECT_RATIO_MODE_FIXED) {
av_log(matroska->ctx, AV_LOG_INFO,
"Ignoring unknown aspect ratio 0x%x\n",
(uint32_t) num);
break;
}
videotrack->ar_mode = num;
break;
}
/* colorspace (only matters for raw video) /* colorspace (only matters for raw video)
* fourcc */ * fourcc */
case MATROSKA_ID_VIDEOCOLORSPACE: { case MATROSKA_ID_VIDEOCOLORSPACE: {
@@ -1210,6 +1166,8 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
"0x%x - ignoring\n", id); "0x%x - ignoring\n", id);
/* pass-through */ /* pass-through */
case MATROSKA_ID_VIDEOSTEREOMODE:
case MATROSKA_ID_VIDEOASPECTRATIO:
case EBML_ID_VOID: case EBML_ID_VOID:
res = ebml_read_skip(matroska); res = ebml_read_skip(matroska);
break; break;
@@ -1328,15 +1286,6 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
break; break;
} }
/* name of the codec */
case MATROSKA_ID_CODECNAME: {
char *text;
if ((res = ebml_read_utf8(matroska, &id, &text)) < 0)
break;
track->codec_name = text;
break;
}
/* name of this track */ /* name of this track */
case MATROSKA_ID_TRACKNAME: { case MATROSKA_ID_TRACKNAME: {
char *text; char *text;
@@ -1569,6 +1518,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
case EBML_ID_VOID: case EBML_ID_VOID:
/* we ignore these because they're nothing useful. */ /* we ignore these because they're nothing useful. */
case MATROSKA_ID_TRACKFLAGFORCED: case MATROSKA_ID_TRACKFLAGFORCED:
case MATROSKA_ID_CODECNAME:
case MATROSKA_ID_CODECDECODEALL: case MATROSKA_ID_CODECDECODEALL:
case MATROSKA_ID_CODECINFOURL: case MATROSKA_ID_CODECINFOURL:
case MATROSKA_ID_CODECDOWNLOADURL: case MATROSKA_ID_CODECDOWNLOADURL:
@@ -3194,7 +3144,6 @@ matroska_read_close (AVFormatContext *s)
for (n = 0; n < matroska->num_tracks; n++) { for (n = 0; n < matroska->num_tracks; n++) {
MatroskaTrack *track = matroska->tracks[n]; MatroskaTrack *track = matroska->tracks[n];
av_free(track->codec_id); av_free(track->codec_id);
av_free(track->codec_name);
av_free(track->codec_priv); av_free(track->codec_priv);
av_free(track->name); av_free(track->name);