diff options
author | mutantmonkey | 2016-03-05 12:06:46 -0800 |
---|---|---|
committer | mutantmonkey | 2016-03-05 12:06:46 -0800 |
commit | 5b87808fecc6a5400088c44f204bdaa12d66b24a (patch) | |
tree | a7a2988c8ba305bda37e65ebaffff7ba51bf8fac /ffmpeg_2.9.patch | |
parent | 873410dd1aeb8f22141f6a0bed944751288cdb51 (diff) | |
download | aur-5b87808fecc6a5400088c44f204bdaa12d66b24a.tar.gz |
upgpkg: info-beamer-git 243.ac815b1-3
Apply ffmpeg_2.9.patch from Debian (thanks qs9rx for the tip) to get it
building against the latest ffmpeg.
Diffstat (limited to 'ffmpeg_2.9.patch')
-rw-r--r-- | ffmpeg_2.9.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/ffmpeg_2.9.patch b/ffmpeg_2.9.patch new file mode 100644 index 000000000000..b14b78007b0f --- /dev/null +++ b/ffmpeg_2.9.patch @@ -0,0 +1,35 @@ +diff -aur info-beamer/video.c info-beamer.patched/video.c +--- info-beamer/video.c 2016-03-04 19:40:01.074477127 +0100 ++++ info-beamer.patched/video.c 2016-03-04 19:40:40.991262568 +0100 +@@ -64,9 +64,9 @@ + if (video->scaler) + sws_freeContext(video->scaler); + if (video->raw_frame) +- av_free(video->raw_frame); ++ av_frame_free(&video->raw_frame); + if (video->scaled_frame) +- av_free(video->scaled_frame); ++ av_frame_free(&video->scaled_frame); + + if (video->codec_context) + avcodec_close(video->codec_context); +@@ -78,7 +78,7 @@ + + static int video_open(video_t *video, const char *filename) { + video->finished = 0; +- video->format = PIX_FMT_RGB24; ++ video->format = AV_PIX_FMT_RGB24; + + if (avformat_open_input(&video->format_context, filename, NULL, NULL) || + avformat_find_stream_info(video->format_context, NULL) < 0) { +@@ -143,8 +143,8 @@ + fprintf(stderr, INFO("fps: %lf\n"), video->fps); + + /* Get framebuffers */ +- video->raw_frame = avcodec_alloc_frame(); +- video->scaled_frame = avcodec_alloc_frame(); ++ video->raw_frame = av_frame_alloc(); ++ video->scaled_frame = av_frame_alloc(); + + if (!video->raw_frame || !video->scaled_frame) { + fprintf(stderr, ERROR("cannot preallocate frames\n")); |