virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'

Browse Source 
* commit 'abb810db036628e11a5171134ebe320b187ee6d6':
  Revert "rtpenc_chain: Don't copy the time_base back to the caller"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-30 22:03:34 +02:00
parent d136fe6fd7 abb810db03
commit 692757062a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtpenc_chain.c
View File

@@ -98,6 +98,9 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
return ret; return ret;
} }
/* Copy the RTP AVStream timebase back to the original AVStream */
st->time_base = rtpctx->streams[0]->time_base;
*out = rtpctx; *out = rtpctx;
return 0; return 0;