mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 20:42:49 +08:00 
			
		
		
		
	Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'
* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		| @@ -1360,12 +1360,6 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index) | |||||||
|                                      st->time_base, |                                      st->time_base, | ||||||
|                                      AV_ROUND_DOWN); |                                      AV_ROUND_DOWN); | ||||||
|             } |             } | ||||||
|         } else if (st->codec->time_base.num != 0 && |  | ||||||
|                    st->codec->time_base.den != 0) { |  | ||||||
|             out_pkt.duration = av_rescale_q_rnd(st->parser->duration, |  | ||||||
|                                                 st->codec->time_base, |  | ||||||
|                                                 st->time_base, |  | ||||||
|                                                 AV_ROUND_DOWN); |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         out_pkt.stream_index = st->index; |         out_pkt.stream_index = st->index; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Michael Niedermayer
					Michael Niedermayer