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

2 Commits

Author SHA1 Message Date
Michael Niedermayer 225c5cc815 Merge commit '373a6dda5422186bc057297342a9e559a564595e' 
* commit '373a6dda5422186bc057297342a9e559a564595e':
  cljr: split decoder and encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/cljrdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:00:59 +02:00
Nidhi Makhijani 373a6dda54 cljr: split decoder and encoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 09:28:20 -07:00