[FFmpeg-devel] [PATCH] movenc: remove uses of deprecated API.

Ronald S. Bultje rsbultje
Sat Feb 26 01:35:43 CET 2011


Hi,

2011/2/25 M?ns Rullg?rd <mans at mansr.com>:
> "Ronald S. Bultje" <rsbultje at gmail.com> writes:
>
>> Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
>> ---
>> ?libavformat/movenc.c | ? ?8 ++++----
>> ?1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
>> index 93d6ce9..de16b5b 100644
>> --- a/libavformat/movenc.c
>> +++ b/libavformat/movenc.c
>> @@ -1233,7 +1233,7 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVTrack *track, AVStream *st)
>> ? ? ?return 0x5c;
>> ?}
>>
>> -static int mov_write_tapt_tag(ByteIOContext *pb, MOVTrack *track)
>> +static int mov_write_tapt_tag(AVIOContext *pb, MOVTrack *track)
>> ?{
>> ? ? ?int32_t width = av_rescale(track->enc->sample_aspect_ratio.num, track->enc->width,
>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? track->enc->sample_aspect_ratio.den);
>> @@ -1241,16 +1241,16 @@ static int mov_write_tapt_tag(ByteIOContext *pb, MOVTrack *track)
>> ? ? ?int64_t pos = url_ftell(pb);
>>
>> ? ? ?avio_wb32(pb, 0); /* size */
>> - ? ?put_tag(pb, "tapt");
>> + ? ?ffio_wfourcc(pb, "tapt");
>>
>> ? ? ?avio_wb32(pb, 20);
>> - ? ?put_tag(pb, "clef");
>> + ? ?ffio_wfourcc(pb, "clef");
>> ? ? ?avio_wb32(pb, 0);
>> ? ? ?avio_wb32(pb, width << 16);
>> ? ? ?avio_wb32(pb, track->enc->height << 16);
>>
>> ? ? ?avio_wb32(pb, 20);
>> - ? ?put_tag(pb, "enof");
>> + ? ?ffio_wfourcc(pb, "enof");
>> ? ? ?avio_wb32(pb, 0);
>> ? ? ?avio_wb32(pb, track->enc->width << 16);
>> ? ? ?avio_wb32(pb, track->enc->height << 16);
>
> Looks OK.

Pushed.

Ronald



More information about the ffmpeg-devel mailing list