diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-20 00:47:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-20 01:29:30 +0100 |
| commit | be2e211dce2964f922e5dee54a7569ebd6efb0da (patch) | |
| tree | a1b6e3a9f5b577230d8c9c2b5b5bcba289ee79f5 /doc/examples/decoding_encoding.c | |
| parent | f4f386dd00e594dc90eb32ae872ae8e22b08d179 (diff) | |
| parent | 6b8b0fe2bc57fdd606074e52ba73cd9b3d95e644 (diff) | |
| download | ffmpeg-be2e211dce2964f922e5dee54a7569ebd6efb0da.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxy: remove reference to removed api
examples: unbreak compilation
ttadec: cosmetics: reindent
sunrast: use RLE trigger macro inplace of the hard coded value.
sunrastenc: set keyframe flag for the output packet.
mpegvideo_enc: switch to encode2().
mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
| -rw-r--r-- | doc/examples/decoding_encoding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 3ac701f83a..255be706a5 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -70,7 +70,7 @@ static void audio_encode_example(const char *filename) c->sample_fmt = AV_SAMPLE_FMT_S16; /* open it */ - if (avcodec_open(c, codec) < 0) { + if (avcodec_open2(c, codec, NULL) < 0) { fprintf(stderr, "could not open codec\n"); exit(1); } @@ -135,7 +135,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) c = avcodec_alloc_context3(codec); /* open it */ - if (avcodec_open(c, codec) < 0) { + if (avcodec_open2(c, codec, NULL) < 0) { fprintf(stderr, "could not open codec\n"); exit(1); } @@ -243,7 +243,7 @@ static void video_encode_example(const char *filename, int codec_id) av_opt_set(c->priv_data, "preset", "slow", 0); /* open it */ - if (avcodec_open(c, codec) < 0) { + if (avcodec_open2(c, codec, NULL) < 0) { fprintf(stderr, "could not open codec\n"); exit(1); } @@ -366,7 +366,7 @@ static void video_decode_example(const char *outfilename, const char *filename) available in the bitstream. */ /* open it */ - if (avcodec_open(c, codec) < 0) { + if (avcodec_open2(c, codec, NULL) < 0) { fprintf(stderr, "could not open codec\n"); exit(1); } |