videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

examples: unbreak compilation 

Update api so it will compile again.
This commit is contained in:
Luca Barbato 2012-02-19 10:34:40 +01:00
parent e04ca1d4ce
commit aac63cef20
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/api-example.c
View File

@ -74,7 +74,7 @@ static void audio_encode_example(const char *filename)
c->channels = 2;
/* open it */
if (avcodec_open(c, codec) < 0) {
if (avcodec_open2(c, codec, NULL) < 0) {
fprintf(stderr, "could not open codec\n");
exit(1);
}
@ -139,7 +139,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);
}
@ -242,7 +242,7 @@ static void video_encode_example(const char *filename)
c->pix_fmt = PIX_FMT_YUV420P;
/* open it */
if (avcodec_open(c, codec) < 0) {
if (avcodec_open2(c, codec, NULL) < 0) {
fprintf(stderr, "could not open codec\n");
exit(1);
}
@ -369,7 +369,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);
}
@ -456,9 +456,6 @@ int main(int argc, char **argv)
{
const char *filename;
/* must be called before using avcodec lib */
avcodec_init();
/* register all the codecs */
avcodec_register_all();

17
libavformat/output-example.c
View File

@ -65,7 +65,7 @@ static AVStream *add_audio_stream(AVFormatContext *oc, enum CodecID codec_id)
AVCodecContext *c;
AVStream *st;
st = av_new_stream(oc, 1);
st = avformat_new_stream(oc, NULL);
if (!st) {
fprintf(stderr, "Could not alloc stream\n");
exit(1);
@ -103,7 +103,7 @@ static void open_audio(AVFormatContext *oc, AVStream *st)
}
/* open it */
if (avcodec_open(c, codec) < 0) {
if (avcodec_open2(c, codec, NULL) < 0) {
fprintf(stderr, "could not open codec\n");
exit(1);
}
@ -164,7 +164,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
get_audio_frame(samples, audio_input_frame_size, c->channels);
pkt.size= avcodec_encode_audio(c, audio_outbuf, audio_outbuf_size, samples);
pkt.size = avcodec_encode_audio2(c, audio_outbuf, audio_outbuf_size, samples);
if (c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE)
pkt.pts= av_rescale_q(c->coded_frame->pts, c->time_base, st->time_base);
@ -275,7 +275,7 @@ static void open_video(AVFormatContext *oc, AVStream *st)
}
/* open the codec */
if (avcodec_open(c, codec) < 0) {
if (avcodec_open2(c, codec, NULL) < 0) {
fprintf(stderr, "could not open codec\n");
exit(1);
}
@ -482,13 +482,6 @@ int main(int argc, char **argv)
audio_st = add_audio_stream(oc, fmt->audio_codec);
}
/* set the output parameters (must be done even if no
parameters). */
if (av_set_parameters(oc, NULL) < 0) {
fprintf(stderr, "Invalid output format parameters\n");
return 1;
}
av_dump_format(oc, 0, filename, 1);
/* now that all the parameters are set, we can open the audio and
@ -507,7 +500,7 @@ int main(int argc, char **argv)
}
/* write the stream header, if any */
av_write_header(oc);
avformat_write_header(oc, NULL);
for(;;) {
/* compute current audio and video time */