videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-31 13:36:39 +02:00
Code Releases Activity
71,343 Commits 36 Branches 398 Tags 236 MiB
48f27b78f4
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