胡斌

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) @@ -525,8 +525,8 @@ int CAVTranscoder::open_output_file(const char *filename)
525 } 525 }
526 526
527 for (int i = 0; i < h / 2; i++){ 527 for (int i = 0; i < h / 2; i++){
528 - memcpy(pDstFrame->data[1] + (y / 2 + i)*pDstFrame->linesize[1] + x / 2, pSrcFrame->data[1] + (i + srcy / 2) * pSrcFrame->linesize[1], w / 2);  
529 - memcpy(pDstFrame->data[2] + (y / 2 + i)*pDstFrame->linesize[2] + x / 2, pSrcFrame->data[2] + (i + srcy / 2) * pSrcFrame->linesize[2], w / 2); 528 + 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);
  529 + 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);
530 } 530 }
531 } 531 }
532 else if (pSrcFrame->pkt_dts == 180) { 532 else if (pSrcFrame->pkt_dts == 180) {
@@ -1097,7 +1097,7 @@ int process_av_files(char * record_info, int piptype) @@ -1097,7 +1097,7 @@ int process_av_files(char * record_info, int piptype)
1097 int main(int argc, char * argv[]) 1097 int main(int argc, char * argv[])
1098 { 1098 {
1099 if (argc < 2) { 1099 if (argc < 2) {
1100 - printf(" merge_pip 2.0.0\n"); 1100 + printf(" merge_pip 2.0.1\n");
1101 printf(" merge video files to one pip video according to record info file,\nusage:"); 1101 printf(" merge video files to one pip video according to record info file,\nusage:");
1102 printf("\n %s record_info_filename [-t {0,1,2}]", argv[0]); 1102 printf("\n %s record_info_filename [-t {0,1,2}]", argv[0]);
1103 printf("\n\n"); 1103 printf("\n\n");