virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-15 06:06:18 +02:00
Code Issues Releases Activity
Files
dbbb31e5bb8889e96506a0831f2f34ea58dec8de
FFmpeg/libavformat/spdifenc.c
Michael Niedermayer 87db7e7772 Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302' 
* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
  dca: Move syncword definitions to a separate header

Conflicts:
	libavcodec/dca_parser.c
	libavformat/dtsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-04 19:28:53 +01:00

20 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink