• Michael Niedermayer's avatar
    Merge commit 'e6153f17' · d46c1c72
    Michael Niedermayer authored
    * commit 'e6153f17':
      avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
    
    Conflicts:
    	libavcodec/libopenjpegdec.c
    	libavcodec/libopenjpegenc.c
    	libavcodec/libx264.c
    	libavcodec/mpeg12enc.c
    	libavcodec/options_table.h
    	libavcodec/snowenc.c
    	libavcodec/tiffenc.c
    	libavdevice/v4l2.c
    	libavdevice/x11grab.c
    	libavfilter/af_amix.c
    	libavfilter/af_asyncts.c
    	libavfilter/af_join.c
    	libavfilter/buffersrc.c
    	libavfilter/src_movie.c
    	libavfilter/vf_delogo.c
    	libavfilter/vf_drawtext.c
    	libavformat/http.c
    	libavformat/img2dec.c
    	libavformat/img2enc.c
    	libavformat/movenc.c
    	libavformat/mpegenc.c
    	libavformat/mpegtsenc.c
    	libavformat/options_table.h
    	libavformat/segment.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d46c1c72
rtmpcrypt.c 11.8 KB