• Michael Niedermayer's avatar
    Merge commit 'd7d6efe4' · 7c425e4f
    Michael Niedermayer authored
    * commit 'd7d6efe4':
      h264: check sps.log2_max_frame_num for validity
      mov: validate number of DataReferenceBox entries against box size
      mov: compute avg_frame_rate only if duration is known
      flac: change minimum and default of lpc_passes option to 1
    
    Conflicts:
    	libavcodec/h264_ps.c
    	libavformat/mov.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7c425e4f
h264_ps.c 25.8 KB