From: Clément Bœsch <u@pkh.me>
Date: Wed, 29 Mar 2017 12:22:32 +0000 (+0200)
Subject: Merge commit '8191f960a669819db4de33a2439ded1630b8a73e'
X-Git-Tag: n3.4-dev~200
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/fdbc29ca70a6f16c92a16cfcf3fdd639e0825b0d

Merge commit '8191f960a669819db4de33a2439ded1630b8a73e'

* commit '8191f960a669819db4de33a2439ded1630b8a73e':
  examples/decode_video: constify the AVCodec instance

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

fdbc29ca70a6f16c92a16cfcf3fdd639e0825b0d
diff --cc doc/examples/decode_video.c
index 1597653,4036dbe..dd1177b
--- a/doc/examples/decode_video.c
+++ b/doc/examples/decode_video.c
@@@ -79,12 -53,13 +79,12 @@@ static int decode_write_frame(const cha
  int main(int argc, char **argv)
  {
      const char *filename, *outfilename;
-     AVCodec *codec;
+     const AVCodec *codec;
      AVCodecContext *c= NULL;
 -    int frame, got_picture, len;
 +    int frame_count;
      FILE *f;
 -    AVFrame *picture;
 +    AVFrame *frame;
      uint8_t inbuf[INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
 -    char buf[1024];
      AVPacket avpkt;
  
      if (argc <= 2) {