Merge commit 'be3363f664d7314d55b42860bd4077154752d769'

* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

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

diff --cc libavformat/nsvdec.c
index 507fb396a51e44b992e7ae99a5316e595afca4a7,05d5f8b9102905d0419184d030d8657387f57ba6..89e4c17c5f6cb48c5c3f9f03fb5423102e48d86e
--- 1/libavformat/nsvdec.c
--- 2/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;