RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'be3363f664d7314d55b42860bd4077154752d769' 

* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 16:04:46 +01:00
parent 1a48a51bfc be3363f664
commit 56d63208d8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/nsvdec.c
View File

@ -176,7 +176,6 @@ typedef struct NSVContext {
int16_t avsync; int16_t avsync;
AVRational framerate; AVRational framerate;
uint32_t *nsvs_timestamps; uint32_t *nsvs_timestamps;
//DVDemuxContext* dv_demux;
} NSVContext; } NSVContext;
static const AVCodecTag nsv_codec_video_tags[] = { 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); 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++) { for (i = 0; i < NSV_MAX_RESYNC; i++) {
if (avio_feof(pb)) { if (avio_feof(pb)) {
av_log(s, AV_LOG_TRACE, "NSV EOF\n"); av_log(s, AV_LOG_TRACE, "NSV EOF\n");
@ -285,7 +282,6 @@ static int nsv_parse_NSVf_header(AVFormatContext *s)
return -1; return -1;
nsv->NSVf_end = size; nsv->NSVf_end = size;
//s->file_size = (uint32_t)avio_rl32(pb);
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 chunk_size %u\n", size);
av_log(s, AV_LOG_TRACE, "NSV NSVf file_size %u\n", file_size); av_log(s, AV_LOG_TRACE, "NSV NSVf file_size %u\n", file_size);