From: Clément Bœsch <u@pkh.me>
Date: Wed, 29 Mar 2017 12:16:33 +0000 (+0200)
Subject: Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83'
X-Git-Tag: n3.4-dev~203
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/4726bbb471566f7d2a0c883210870871a17fe2e3

Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83'

* commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83':
  examples/encode_video: set the framerate

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

4726bbb471566f7d2a0c883210870871a17fe2e3
diff --cc doc/examples/encode_video.c
index 265b529,b955cce..ba6f2bf
--- a/doc/examples/encode_video.c
+++ b/doc/examples/encode_video.c
@@@ -75,23 -69,16 +75,25 @@@ int main(int argc, char **argv
      c->width = 352;
      c->height = 288;
      /* frames per second */
-     c->time_base = (AVRational){1,25};
+     c->time_base = (AVRational){1, 25};
+     c->framerate = (AVRational){25, 1};
+ 
 -    c->gop_size = 10; /* emit one intra frame every ten frames */
 -    c->max_b_frames=1;
 +    /* emit one intra frame every ten frames
 +     * check frame pict_type before passing frame
 +     * to encoder, if frame->pict_type is AV_PICTURE_TYPE_I
 +     * then gop_size is ignored and the output of encoder
 +     * will always be I frame irrespective to gop_size
 +     */
 +    c->gop_size = 10;
 +    c->max_b_frames = 1;
      c->pix_fmt = AV_PIX_FMT_YUV420P;
  
 +    if (codec->id == AV_CODEC_ID_H264)
 +        av_opt_set(c->priv_data, "preset", "slow", 0);
 +
      /* open it */
      if (avcodec_open2(c, codec, NULL) < 0) {
 -        fprintf(stderr, "could not open codec\n");
 +        fprintf(stderr, "Could not open codec\n");
          exit(1);
      }