diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 02:12:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 03:10:08 +0200 |
| commit | 9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba (patch) | |
| tree | 90555a38c78062885be162271998559c64fe80ff /libavcodec/j2kenc.c | |
| parent | fd7e1190379db1b2b3eaa31c00dc9c92803faef3 (diff) | |
| download | ffmpeg-9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba.tar.gz | |
j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kenc.c')
| -rw-r--r-- | libavcodec/j2kenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index e75464ae36..e4c84efd1a 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1036,8 +1036,8 @@ static int j2kenc_destroy(AVCodecContext *avctx) return 0; } -AVCodec ff_j2k_encoder = { - .name = "j2k", +AVCodec ff_jpeg2000_encoder = { + .name = "jpeg2000", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, .priv_data_size = sizeof(Jpeg2000EncoderContext), |