eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 05:35:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4bb4fa28e3741663e0e76f2e2a628cfdcca6765c
ffmpeg/libavcodec/hevc_data.c
Michael Niedermayer 5be07d0206 Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b' 
* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
	libavcodec/Makefile
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 17:04:13 +02:00

1.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink