eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
add040ff01cd325dde30e43bda5d603c99f27e8a
ffmpeg/libavcodec/cljrenc.c
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

4.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink