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 /libavformat/r3d.c | |
| parent | ca6e7708b42e7d33ba3053bcd447d52a077bca25 (diff) | |
| download | ffmpeg-72415b2adb2c25f95ceede49001bb97ed9247dbb.tar.gz | |
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 'libavformat/r3d.c')
| -rw-r--r-- | libavformat/r3d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 4f03d7f248..398ef62048 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -56,7 +56,7 @@ static int r3d_read_red1(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_JPEG2000; tmp = get_byte(s->pb); // major version @@ -89,7 +89,7 @@ static int r3d_read_red1(AVFormatContext *s) AVStream *ast = av_new_stream(s, 1); if (!ast) return AVERROR(ENOMEM); - ast->codec->codec_type = CODEC_TYPE_AUDIO; + ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_id = CODEC_ID_PCM_S32BE; ast->codec->channels = tmp; av_set_pts_info(ast, 32, 1, st->time_base.den); |