diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-18 17:26:24 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-18 17:26:24 +0000 |
| commit | 0e169d16f1ed2424c875edfc8cc4d7e7ee6a8e8d (patch) | |
| tree | ca14e393faa2dd0b0d910cdd1443951d862e23ad | |
| parent | 68a71451f6c748ccb046e3c8a0487ca26f7ed4c3 (diff) | |
| download | ffmpeg-0e169d16f1ed2424c875edfc8cc4d7e7ee6a8e8d.tar.gz | |
matroskadec: merge ByteIOContext declarations at upper level
Originally committed as revision 16673 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/matroskadec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 7f4f0c4063..8ee1f6e335 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1118,6 +1118,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) uint8_t *extradata = NULL; int extradata_size = 0; int extradata_offset = 0; + ByteIOContext b; /* Apply some sanity checks. */ if (track->type != MATROSKA_TRACK_TYPE_VIDEO && @@ -1201,7 +1202,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) } else if (!strcmp(track->codec_id, "A_MS/ACM") && track->codec_priv.size >= 18 && track->codec_priv.data != NULL) { - ByteIOContext b; init_put_byte(&b, track->codec_priv.data, track->codec_priv.size, URL_RDONLY, NULL, NULL, NULL, NULL); get_wav_header(&b, st->codec, track->codec_priv.size); @@ -1244,7 +1244,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) } else extradata_size = 2; } else if (codec_id == CODEC_ID_TTA) { - ByteIOContext b; extradata_size = 30; extradata = av_mallocz(extradata_size); if (extradata == NULL) @@ -1266,8 +1265,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) track->audio.channels = 1; } else if (codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK || codec_id == CODEC_ID_ATRAC3) { - ByteIOContext b; - init_put_byte(&b, track->codec_priv.data,track->codec_priv.size, 0, NULL, NULL, NULL, NULL); url_fskip(&b, 24); |