[FFmpeg-cvslog] Merge commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4'

[Clément Bœsch]

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

Merge commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4'

* commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4':
  examples/encode_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=e9bd45746511ab3a5803bc1b3490f4d682144289
---

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

diff --git a/doc/examples/encode_video.c b/doc/examples/encode_video.c
index 71c8c0b..265b529 100644
--- a/doc/examples/encode_video.c
+++ b/doc/examples/encode_video.c
@@ -39,7 +39,7 @@
 int main(int argc, char **argv)
 {
     const char *filename, *codec_name;
-    AVCodec *codec;
+    const AVCodec *codec;
     AVCodecContext *c= NULL;
     int i, ret, x, y, got_output;
     FILE *f;


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

diff --cc doc/examples/encode_video.c
index 71c8c0b,c5f3853f..265b529
--- a/doc/examples/encode_video.c
+++ b/doc/examples/encode_video.c
@@@ -38,8 -36,8 +38,8 @@@
  
  int main(int argc, char **argv)
  {
 -    const char *filename;
 +    const char *filename, *codec_name;
-     AVCodec *codec;
+     const AVCodec *codec;
      AVCodecContext *c= NULL;
      int i, ret, x, y, got_output;
      FILE *f;