[FFmpeg-cvslog] Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'

Michael Niedermayer git at videolan.org
Fri Jul 11 12:05:24 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 11:54:23 2014 +0200| [673a2b3818032ccf98f7846e33f54f7b89a41401] | committer: Michael Niedermayer

Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'

* commit '1493b237bd3f9707319ac58d315ce45312900c10':
  hevc: Replace nal type chek with equivalent IS_IRAP macro

Conflicts:
	libavcodec/hevc.c

See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=673a2b3818032ccf98f7846e33f54f7b89a41401
---





More information about the ffmpeg-cvslog mailing list