diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 16:04:46 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 16:04:46 +0100 |
| commit | 56d63208d8249be3d2a54b8a25c27fc178d84df0 (patch) | |
| tree | 0b2f1e9a0485ac8968ade1bd19b9d87575f5a245 | |
| parent | 1a48a51bfcd0c8b1fd22ae6a8ad5b1e26bec5bee (diff) | |
| parent | be3363f664d7314d55b42860bd4077154752d769 (diff) | |
Merge commit 'be3363f664d7314d55b42860bd4077154752d769'
* commit 'be3363f664d7314d55b42860bd4077154752d769':
nsv: Drop disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavformat/nsvdec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 507fb396a5..89e4c17c5f 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -176,7 +176,6 @@ typedef struct NSVContext { int16_t avsync; AVRational framerate; uint32_t *nsvs_timestamps; - //DVDemuxContext* dv_demux; } NSVContext; static const AVCodecTag nsv_codec_video_tags[] = { @@ -229,8 +228,6 @@ static int nsv_resync(AVFormatContext *s) av_log(s, AV_LOG_TRACE, "%s(), offset = %"PRId64", state = %d\n", __FUNCTION__, avio_tell(pb), nsv->state); - //nsv->state = NSV_UNSYNC; - for (i = 0; i < NSV_MAX_RESYNC; i++) { if (avio_feof(pb)) { av_log(s, AV_LOG_TRACE, "NSV EOF\n"); @@ -285,7 +282,6 @@ static int nsv_parse_NSVf_header(AVFormatContext *s) return -1; nsv->NSVf_end = size; - //s->file_size = (uint32_t)avio_rl32(pb); file_size = (uint32_t)avio_rl32(pb); av_log(s, AV_LOG_TRACE, "NSV NSVf chunk_size %u\n", size); av_log(s, AV_LOG_TRACE, "NSV NSVf file_size %u\n", file_size); |