Ignore blocks with no samples and flags (but usually with MD5 sum)

[ffmpeg] / libavcodec / dvdsubenc.c

diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 8f3d90d6d7db94f20e46aefb0edbb10caad038cd..fac29acc2c664a9ffe1f8f92e65763f5e375d29e 100644 (file)
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -2,28 +2,27 @@
  * DVD subtitle encoding for ffmpeg
  * Copyright (c) 2005 Wolfram Gloger.
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
 
 #undef NDEBUG
 #include <assert.h>
 
-typedef struct DVDSubtitleContext {
-} DVDSubtitleContext;
-
 // ncnt is the nibble counter
 #define PUTNIBBLE(val)\
 do {\
@@ -190,7 +189,7 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
         *q++ = h->rects[object_id].y >> 4;
         *q++ = (h->rects[object_id].y << 4) | ((y2 >> 8) & 0xf);
         *q++ = y2;
-        
+
         *q++ = 0x06;
         // offset1, offset2
         putbe16(&q, offset1[object_id]);
@@ -207,7 +206,7 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
 
     qq = outbuf;
     putbe16(&qq, q - outbuf);
-    
+
     av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%td\n", q - outbuf);
     return q - outbuf;
 }
@@ -237,7 +236,7 @@ AVCodec dvdsub_encoder = {
     "dvdsub",
     CODEC_TYPE_SUBTITLE,
     CODEC_ID_DVD_SUBTITLE,
-    sizeof(DVDSubtitleContext),
+    0,
     dvdsub_init_encoder,
     dvdsub_encode,
     dvdsub_close_encoder,