[SCM] libav/experimental: Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:35:00 UTC 2013
The following commit has been merged in the experimental branch:
commit c639fc7213b4ed01a558cdeef453f1f476e9c2b3
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date: Sat Jan 10 23:00:48 2009 +0000
Cosmetics: Rename ff_vdpau_h264_add_data_chunk as ff_vdpau_add_data_chunk.
Originally committed as revision 16521 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 310251d..400dca9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7425,8 +7425,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
&& avctx->skip_frame < AVDISCARD_ALL){
if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){
static const uint8_t start_code[] = {0x00, 0x00, 0x01};
- ff_vdpau_h264_add_data_chunk(s, start_code, sizeof(start_code));
- ff_vdpau_h264_add_data_chunk(s, &buf[buf_index - consumed], consumed );
+ ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code));
+ ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed], consumed );
}else
context_count++;
}
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 8e120c3..8391119 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -27,8 +27,8 @@
#include <stdint.h>
#include "h264.h"
-void ff_vdpau_h264_add_data_chunk(MpegEncContext *s, const uint8_t *buf,
- int buf_size);
+void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf,
+ int buf_size);
void ff_vdpau_h264_set_reference_frames(H264Context *h);
void ff_vdpau_h264_picture_complete(H264Context *h);
diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpauvideo.c
index e79fa5a..8271bfe 100644
--- a/libavcodec/vdpauvideo.c
+++ b/libavcodec/vdpauvideo.c
@@ -106,8 +106,8 @@ void ff_vdpau_h264_set_reference_frames(H264Context *h)
}
}
-void ff_vdpau_h264_add_data_chunk(MpegEncContext *s,
- const uint8_t *buf, int buf_size)
+void ff_vdpau_add_data_chunk(MpegEncContext *s,
+ const uint8_t *buf, int buf_size)
{
struct vdpau_render_state * render;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list