Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'

Browse Source

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

Conflicts:
	libavcodec/hevc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-07-11 11:54:23 +02:00

parent f351afb5f9 1493b237bd

commit 673a2b3818

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available