diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/dvdsubdec.c')
-rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/dvdsubdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/dvdsubdec.c b/chromium/third_party/ffmpeg/libavcodec/dvdsubdec.c index 31ce0accc69..53287bd1226 100644 --- a/chromium/third_party/ffmpeg/libavcodec/dvdsubdec.c +++ b/chromium/third_party/ffmpeg/libavcodec/dvdsubdec.c @@ -18,9 +18,9 @@ * 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" #include "get_bits.h" -#include "dsputil.h" #include "internal.h" #include "libavutil/attributes.h" @@ -46,7 +46,7 @@ typedef struct DVDSubContext static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values) { - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; uint8_t r, g, b; int i, y, cb, cr; int r_add, g_add, b_add; @@ -599,8 +599,10 @@ static int dvdsub_parse_extradata(AVCodecContext *avctx) int w, h; if (sscanf(data + 5, "%dx%d", &w, &h) == 2) { int ret = ff_set_dimensions(avctx, w, h); - if (ret < 0) + if (ret < 0) { + av_free(dataorig); return ret; + } } } |