aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-17 20:36:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-17 20:36:03 +0200
commit107460c1e9b6a0c348b35f105cc89ef2ac5edc79 (patch)
tree9e31c9e394a512d16d7b0ca42714230ae0729068
parent65e32eea733f1dff59d5b8fcec68f6db08a003c0 (diff)
downloadffmpeg-107460c1e9b6a0c348b35f105cc89ef2ac5edc79.tar.gz
examples/decoding_encoding.c: test mpeg1 and h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/examples/decoding_encoding.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c
index debf591aaf..ee0cb585f5 100644
--- a/doc/examples/decoding_encoding.c
+++ b/doc/examples/decoding_encoding.c
@@ -194,7 +194,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
/*
* Video encoding example
*/
-static void video_encode_example(const char *filename)
+static void video_encode_example(const char *filename, int codec_id)
{
AVCodec *codec;
AVCodecContext *c= NULL;
@@ -206,7 +206,7 @@ static void video_encode_example(const char *filename)
printf("Video encoding\n");
/* find the mpeg1 video encoder */
- codec = avcodec_find_encoder(CODEC_ID_H264);
+ codec = avcodec_find_encoder(codec_id);
if (!codec) {
fprintf(stderr, "codec not found\n");
exit(1);
@@ -226,7 +226,8 @@ static void video_encode_example(const char *filename)
c->max_b_frames=1;
c->pix_fmt = PIX_FMT_YUV420P;
- av_opt_set(c->priv_data, "preset", "slow", 0);
+ if(codec_id == CODEC_ID_H264)
+ av_opt_set(c->priv_data, "preset", "slow", 0);
/* open it */
if (avcodec_open(c, codec) < 0) {
@@ -449,8 +450,9 @@ int main(int argc, char **argv)
audio_encode_example("/tmp/test.mp2");
audio_decode_example("/tmp/test.sw", "/tmp/test.mp2");
- video_encode_example("/tmp/test.h264");
- filename = "/tmp/test.h264";
+ video_encode_example("/tmp/test.h264", CODEC_ID_H264);
+ video_encode_example("/tmp/test.mpg", CODEC_ID_MPEG1VIDEO);
+ filename = "/tmp/test.mpg";
} else {
filename = argv[1];
}