[FFmpeg-cvslog] Merge commit 'be3363f664d7314d55b42860bd4077154752d769'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 16:04:46 2017 +0100| [56d63208d8249be3d2a54b8a25c27fc178d84df0] | committer: Clément Bœsch

Merge commit 'be3363f664d7314d55b42860bd4077154752d769'

* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56d63208d8249be3d2a54b8a25c27fc178d84df0
---

 libavformat/nsvdec.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 507fb39..89e4c17 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);


======================================================================

diff --cc libavformat/nsvdec.c
index 507fb39,05d5f8b..89e4c17
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@@ -229,10 -229,8 +228,8 @@@ static int nsv_resync(AVFormatContext *
  
      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 (pb->eof_reached) {
 +        if (avio_feof(pb)) {
              av_log(s, AV_LOG_TRACE, "NSV EOF\n");
              nsv->state = NSV_UNSYNC;
              return -1;