[FFmpeg-devel] [PATCH] CD+G Demuxer & Decoder

[Michael Tison]

On Mon, Dec 7, 2009 at 12:02 AM, Diego Biurrun <diego at biurrun.de> wrote:
> On Sun, Dec 06, 2009 at 10:50:10PM -0800, Michael Tison wrote:
>> --- libavcodec/cdgraphics.c ? ? (revision 0)
>> +++ libavcodec/cdgraphics.c ? ? (revision 0)
>> @@ -0,0 +1,372 @@
>> +static void cdg_border_preset(CDGraphicsContext *cc, uint8_t *data)
>> +{
>> +
>> + ? ?if (!(data[1] & 0x0F)) {
>> + ? ? ? /// fill the top and bottom borders
>> + ? ? ? memset(buf, color, CDG_BORDER_HEIGHT * lsize);
>
> Indentation is off (3 spaces).
>
>> +static void cdg_load_palette(CDGraphicsContext *cc, uint8_t *data, int low)
>> +{
>> +
>> + ? ?for (i = 0; i < 8; i++) {
>> + ? ? ? color = (data[2 * i] << 6) + (data[2 * i + 1] & 0x3F);
>
> same
>
> .. and the list goes on, please fix them all.
>
>> --- libavformat/cdg.c ? (revision 0)
>> +++ libavformat/cdg.c ? (revision 0)
>> @@ -0,0 +1,73 @@
>> +
>> +static int read_packet(AVFormatContext *s, AVPacket *pkt)
>> +{
>> +
>> + ? ?if (ret != CDG_PACKET_SIZE) {
>> + ? ? ? av_free_packet(pkt);
>> + ? ? ? return ret < 0 ? ret : AVERROR(EIO);
>
> Indentation is off again.

Ouch sorry.

Attached is revised patch.

Michael
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cdgraphicsv5.patch
Type: text/x-diff
Size: 18435 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20091207/abdc141d/attachment.patch>