[FFmpeg-cvslog] Merge commit '8191f960a669819db4de33a2439ded1630b8a73e'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 29 14:22:32 2017 +0200| [fdbc29ca70a6f16c92a16cfcf3fdd639e0825b0d] | committer: Clément Bœsch

Merge commit '8191f960a669819db4de33a2439ded1630b8a73e'

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

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

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

 doc/examples/decode_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c
index 1597653..dd1177b 100644
--- a/doc/examples/decode_video.c
+++ b/doc/examples/decode_video.c
@@ -79,7 +79,7 @@ static int decode_write_frame(const char *outfilename, AVCodecContext *avctx,
 int main(int argc, char **argv)
 {
     const char *filename, *outfilename;
-    AVCodec *codec;
+    const AVCodec *codec;
     AVCodecContext *c= NULL;
     int frame_count;
     FILE *f;


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

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) {