胡斌

fix bug of copy u,v of scaled image when rotate is 0

... ... @@ -525,8 +525,8 @@ int CAVTranscoder::open_output_file(const char *filename)
}
for (int i = 0; i < h / 2; i++){
memcpy(pDstFrame->data[1] + (y / 2 + i)*pDstFrame->linesize[1] + x / 2, pSrcFrame->data[1] + (i + srcy / 2) * pSrcFrame->linesize[1], w / 2);
memcpy(pDstFrame->data[2] + (y / 2 + i)*pDstFrame->linesize[2] + x / 2, pSrcFrame->data[2] + (i + srcy / 2) * pSrcFrame->linesize[2], w / 2);
memcpy(pDstFrame->data[1] + (y / 2 + i)*pDstFrame->linesize[1] + x / 2, pSrcFrame->data[1] + (i + srcy / 2) * pSrcFrame->linesize[1] + srcx/2, w / 2);
memcpy(pDstFrame->data[2] + (y / 2 + i)*pDstFrame->linesize[2] + x / 2, pSrcFrame->data[2] + (i + srcy / 2) * pSrcFrame->linesize[2] + srcx/2, w / 2);
}
}
else if (pSrcFrame->pkt_dts == 180) {
... ...
... ... @@ -1097,7 +1097,7 @@ int process_av_files(char * record_info, int piptype)
int main(int argc, char * argv[])
{
if (argc < 2) {
printf(" merge_pip 2.0.0\n");
printf(" merge_pip 2.0.1\n");
printf(" merge video files to one pip video according to record info file,\nusage:");
printf("\n %s record_info_filename [-t {0,1,2}]", argv[0]);
printf("\n\n");
... ...