diff options
| author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
| commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
| tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /libmpcodecs/vd_ffmpeg.c | |
| parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
| parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
| download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index d36e4122a0..343a26d8d3 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -583,9 +583,6 @@ static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic) } if (mpi) { - // Palette support: free palette buffer allocated in get_buffer - if (mpi->bpp == 8) - av_freep(&mpi->planes[1]); // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU) mpi->usage_count--; } |