aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cljr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 01:20:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 01:20:46 +0100
commit1a4ffa5b136a112935e7db19eb49e6042c6d5143 (patch)
treeebacb4ce290422cfe893bc96180d961fa7b7a43f /libavcodec/cljr.c
parent3220a894f794607efab96ec3837e4c64f19f75ea (diff)
parent8b63ebcb038683a6a772d0e9d9518b60bbd9a22f (diff)
downloadffmpeg-1a4ffa5b136a112935e7db19eb49e6042c6d5143.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: build: Remove redundant OBJS declaration intended for programs Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cljr.c')
0 files changed, 0 insertions, 0 deletions