diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-30 23:30:55 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-30 23:30:55 +0000 |
| commit | 72415b2adb2c25f95ceede49001bb97ed9247dbb (patch) | |
| tree | 99247889aa61bb7621c966466ea4b84c100207d3 /libavcodec/msmpeg4.c | |
| parent | ca6e7708b42e7d33ba3053bcd447d52a077bca25 (diff) | |
Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 60d104bdef..94127cf7b6 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -1921,7 +1921,7 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, AVCodec msmpeg4v1_decoder = { "msmpeg4v1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V1, sizeof(MpegEncContext), ff_msmpeg4_decode_init, @@ -1935,7 +1935,7 @@ AVCodec msmpeg4v1_decoder = { AVCodec msmpeg4v2_decoder = { "msmpeg4v2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V2, sizeof(MpegEncContext), ff_msmpeg4_decode_init, @@ -1949,7 +1949,7 @@ AVCodec msmpeg4v2_decoder = { AVCodec msmpeg4v3_decoder = { "msmpeg4", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_MSMPEG4V3, sizeof(MpegEncContext), ff_msmpeg4_decode_init, @@ -1963,7 +1963,7 @@ AVCodec msmpeg4v3_decoder = { AVCodec wmv1_decoder = { "wmv1", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV1, sizeof(MpegEncContext), ff_msmpeg4_decode_init, |