diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 13:38:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 15:49:31 +0200 |
commit | 17085a0251a1493f6447aa3d2ee06fda2c9402f0 (patch) | |
tree | d627e3d5bdcf01ed711249c30247c74dd7087367 /libavcodec/options.c | |
parent | 51c810e62b63a1451b337b1cba0141b386066668 (diff) | |
parent | 7ea1b3472a61de4aa4d41b571e99418e4997ad41 (diff) | |
download | ffmpeg-17085a0251a1493f6447aa3d2ee06fda2c9402f0.tar.gz |
Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'
* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
lavc: deprecate the use of AVCodecContext.time_base for decoding
Conflicts:
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo_parser.c
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r-- | libavcodec/options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index ec9830face..5d818a2031 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -106,6 +106,7 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) av_opt_set_defaults2(s, flags, flags); s->time_base = (AVRational){0,1}; + s->framerate = (AVRational){ 0, 1 }; s->get_buffer2 = avcodec_default_get_buffer2; s->get_format = avcodec_default_get_format; s->execute = avcodec_default_execute; |