RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
74,091 Commits 36 Branches 398 Tags 238 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
Michael Niedermayer e46a7fdc87 Merge commit '4da5aacc7eba274a4f18411120de539d39c5151e' 
* commit '4da5aacc7eba274a4f18411120de539d39c5151e':
  dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 21:14:46 +01:00
Diego Biurrun 4da5aacc7e dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int 2015-03-13 21:20:37 +01:00
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
Diego Biurrun 25f613f8be dca: Move syncword definitions to a separate header 2015-03-04 13:29:33 +01:00