* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			82 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			82 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * SSA/ASS decoder
 | |
|  * Copyright (c) 2010  Aurelien Jacobs <aurel@gnuage.org>
 | |
|  *
 | |
|  * 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.1 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * 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 FFmpeg; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | |
|  */
 | |
| 
 | |
| #include <string.h>
 | |
| 
 | |
| #include "avcodec.h"
 | |
| #include "ass.h"
 | |
| #include "ass_split.h"
 | |
| #include "libavutil/internal.h"
 | |
| #include "libavutil/mem.h"
 | |
| 
 | |
| static av_cold int ass_decode_init(AVCodecContext *avctx)
 | |
| {
 | |
|     avctx->subtitle_header = av_malloc(avctx->extradata_size);
 | |
|     if (!avctx->subtitle_header)
 | |
|         return AVERROR(ENOMEM);
 | |
|     memcpy(avctx->subtitle_header, avctx->extradata, avctx->extradata_size);
 | |
|     avctx->subtitle_header_size = avctx->extradata_size;
 | |
|     avctx->priv_data = ff_ass_split(avctx->extradata);
 | |
|     if(!avctx->priv_data)
 | |
|         return -1;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
 | |
|                             AVPacket *avpkt)
 | |
| {
 | |
|     const char *ptr = avpkt->data;
 | |
|     int len, size = avpkt->size;
 | |
| 
 | |
|     while (size > 0) {
 | |
|         int duration;
 | |
|         ASSDialog *dialog = ff_ass_split_dialog(avctx->priv_data, ptr, 0, NULL);
 | |
|         if (!dialog)
 | |
|             return AVERROR_INVALIDDATA;
 | |
|         duration = dialog->end - dialog->start;
 | |
|         len = ff_ass_add_rect(data, ptr, 0, duration, 1);
 | |
|         if (len < 0)
 | |
|             return len;
 | |
|         ptr  += len;
 | |
|         size -= len;
 | |
|     }
 | |
| 
 | |
|     *got_sub_ptr = avpkt->size > 0;
 | |
|     return avpkt->size;
 | |
| }
 | |
| 
 | |
| static int ass_decode_close(AVCodecContext *avctx)
 | |
| {
 | |
|     ff_ass_split_free(avctx->priv_data);
 | |
|     avctx->priv_data = NULL;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| AVCodec ff_ass_decoder = {
 | |
|     .name         = "ass",
 | |
|     .long_name    = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
 | |
|     .type         = AVMEDIA_TYPE_SUBTITLE,
 | |
|     .id           = AV_CODEC_ID_SSA,
 | |
|     .init         = ass_decode_init,
 | |
|     .decode       = ass_decode_frame,
 | |
|     .close        = ass_decode_close,
 | |
| };
 |