virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00
Code Issues Releases Activity

Add some more deprecation guards

Browse Source 
Avoids unused function/label/variable warnings after the next version bump.
This commit is contained in:
Diego Biurrun 2016-05-04 00:27:19 +02:00
parent b7e64fba7f
commit 763d69bfb2
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avconv.c
View File

@ -569,10 +569,12 @@ error:
exit_program(1); exit_program(1);
} }
#if FF_API_CODED_FRAME
static double psnr(double d) static double psnr(double d)
{ {
return -10.0 * log(d) / log(10.0); return -10.0 * log(d) / log(10.0);
} }
#endif
static void do_video_stats(OutputStream *ost, int frame_size) static void do_video_stats(OutputStream *ost, int frame_size)
{ {

2
libavcodec/error_resilience.c
View File

@ -1199,7 +1199,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
s->mb_height, linesize[2], 0); s->mb_height, linesize[2], 0);
} }
#if FF_API_XVMC
ec_clean: ec_clean:
#endif
/* clean a few tables */ /* clean a few tables */
for (i = 0; i < s->mb_num; i++) { for (i = 0; i < s->mb_num; i++) {
const int mb_xy = s->mb_index2xy[i]; const int mb_xy = s->mb_index2xy[i];

6
libavcodec/qtrleenc.c
View File

@ -297,7 +297,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
QtrleEncContext * const s = avctx->priv_data; QtrleEncContext * const s = avctx->priv_data;
#if FF_API_CODED_FRAME
enum AVPictureType pict_type; enum AVPictureType pict_type;
#endif
int ret; int ret;
if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) { if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) {
@ -308,11 +310,15 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) { if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) {
/* I-Frame */ /* I-Frame */
#if FF_API_CODED_FRAME
pict_type = AV_PICTURE_TYPE_I; pict_type = AV_PICTURE_TYPE_I;
#endif
s->key_frame = 1; s->key_frame = 1;
} else { } else {
/* P-Frame */ /* P-Frame */
#if FF_API_CODED_FRAME
pict_type = AV_PICTURE_TYPE_P; pict_type = AV_PICTURE_TYPE_P;
#endif
s->key_frame = 0; s->key_frame = 0;
} }