[FFmpeg-devel] [PATCH] frmdec: stop abusing ff_codec_get_id()

[Paul B Mahol]

On 1/8/13, Peter Ross <pross at xvid.org> wrote:
> On Tue, Jan 08, 2013 at 04:10:52PM +0000, Paul B Mahol wrote:
>> No functional change.
>>
>> Signed-off-by: Paul B Mahol <onemda at gmail.com>
>> ---
>>  libavformat/frmdec.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c
>> index 914bab5..872a8d8 100644
>> --- a/libavformat/frmdec.c
>> +++ b/libavformat/frmdec.c
>> @@ -24,11 +24,11 @@
>>   * Megalux Frame demuxer
>>   */
>>
>> +#include "libavcodec/raw.h"
>>  #include "libavutil/intreadwrite.h"
>>  #include "avformat.h"
>> -#include "riff.h"
>>
>> -static const AVCodecTag frm_pix_fmt_tags[] = {
>> +static const PixelFormatTag frm_pix_fmt_tags[] = {
>>      { AV_PIX_FMT_RGB555, 1 },
>>      { AV_PIX_FMT_RGB0,   2 },
>>      { AV_PIX_FMT_RGB24,  3 },
>> @@ -61,7 +61,7 @@ static int frm_read_header(AVFormatContext *avctx)
>>      st->codec->codec_id   = AV_CODEC_ID_RAWVIDEO;
>>      avio_skip(pb, 3);
>>
>> -    st->codec->pix_fmt    = ff_codec_get_id(frm_pix_fmt_tags,
>> avio_r8(pb));
>> +    st->codec->pix_fmt    = ff_find_pix_fmt(frm_pix_fmt_tags,
>> avio_r8(pb));
>>      if (!st->codec->pix_fmt)
>>          return AVERROR_INVALIDDATA;
>
> Okay.

applied

>
> -- Peter
> (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
>