diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 11:53:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 11:53:15 +0100 |
| commit | 9c0ec23c7dde8a2d6a356fa21cf3339b208467cf (patch) | |
| tree | 0a088938209af2c626087587864be5002479c7dc /libavcodec/asvenc.c | |
| parent | e7f255d89b587ce78b17d1bd45521d21ff10822b (diff) | |
| parent | 998fdcff41bbda8ef13c991743376556f910efa9 (diff) | |
| download | ffmpeg-9c0ec23c7dde8a2d6a356fa21cf3339b208467cf.tar.gz | |
Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'
* commit '998fdcff41bbda8ef13c991743376556f910efa9':
lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
svq1: unmacroify macros used only once.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asvenc.c')
| -rw-r--r-- | libavcodec/asvenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 259cd689a5..e5f3b48ea4 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -267,7 +267,8 @@ AVCodec ff_asv1_encoder = { .priv_data_size = sizeof(ASV1Context), .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum PixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; #endif @@ -280,7 +281,8 @@ AVCodec ff_asv2_encoder = { .priv_data_size = sizeof(ASV1Context), .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum PixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif |