Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'

* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
  tools: Port to codec parameters API

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc tools/ismindex.c
index dfef118,3d7e082..5917d42
--- 1/tools/ismindex.c
--- 2/tools/ismindex.c
+++ b/tools/ismindex.c
@@@ -453,14 -450,13 +453,14 @@@ fail
      return err;
  }
  
- static int get_private_data(struct Track *track, AVCodecContext *codec)
+ static int get_private_data(struct Track *track, AVCodecParameters *codecpar)
  {
 -    track->codec_private_size = codecpar->extradata_size;
 +    track->codec_private_size = 0;
-     track->codec_private      = av_mallocz(codec->extradata_size);
+     track->codec_private      = av_mallocz(codecpar->extradata_size);
      if (!track->codec_private)
          return AVERROR(ENOMEM);
-     track->codec_private_size = codec->extradata_size;
-     memcpy(track->codec_private, codec->extradata, codec->extradata_size);
++    track->codec_private_size = codecpar->extradata_size;
+     memcpy(track->codec_private, codecpar->extradata, codecpar->extradata_size);
      return 0;
  }
  

diff --cc tools/sidxindex.c
Simple merge